summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-07-20 14:17:00 +0300
committerDave Airlie <airlied@redhat.com>2012-07-25 14:12:17 +1000
commit1e179d4e283bd197035960ef751b5ccac06cbf91 (patch)
tree56c654d2772ceb77823669d79c0f1b491226dec5 /drivers/gpu
parentd1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c (diff)
downloadblackbird-op-linux-1e179d4e283bd197035960ef751b5ccac06cbf91.tar.gz
blackbird-op-linux-1e179d4e283bd197035960ef751b5ccac06cbf91.zip
drm/radeon: check for allocation failure in radeon_ring_backup()
Static checkers complain if this we don't check for allocation failure. Also we can use the new kmalloc_array() function here as a cleanup. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index f2fc25de0b2f..ec79b3750430 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -594,7 +594,11 @@ unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring
}
/* and then save the content of the ring */
- *data = kmalloc(size * 4, GFP_KERNEL);
+ *data = kmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);
+ if (!*data) {
+ mutex_unlock(&rdev->ring_lock);
+ return 0;
+ }
for (i = 0; i < size; ++i) {
(*data)[i] = ring->ring[ptr++];
ptr &= ring->ptr_mask;
OpenPOWER on IntegriCloud