diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-12-09 21:28:31 +0200 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-10 17:47:26 +0100 |
| commit | 3cf54b34dafe800d9522b93249b6f4c1bfb50de2 (patch) | |
| tree | 91d249482469d9b67e793e54f126f13424af38df | |
| parent | drm/i915: Protect pipe_crc->entries update (diff) | |
| download | linux-dev-3cf54b34dafe800d9522b93249b6f4c1bfb50de2.tar.xz linux-dev-3cf54b34dafe800d9522b93249b6f4c1bfb50de2.zip | |
drm/i915: Allocate the pipe_crc->entires with kcalloc()
pipe_crc->entries[] is an array so allocate with kcalloc() instead of
kzalloc().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 218e27cb3e2f..95829ebecf21 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -3415,8 +3415,8 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe, DRM_DEBUG_DRIVER("collecting CRCs for pipe %c, %s\n", pipe_name(pipe), pipe_crc_source_name(source)); - entries = kzalloc(sizeof(*pipe_crc->entries) * - INTEL_PIPE_CRC_ENTRIES_NR, + entries = kcalloc(INTEL_PIPE_CRC_ENTRIES_NR, + sizeof(pipe_crc->entries[0]), GFP_KERNEL); if (!entries) return -ENOMEM; |