From: Nicolas THERY Date: Tue, 7 Aug 2012 08:24:59 +0000 (-0300) Subject: [media] media: fix MEDIA_IOC_DEVICE_INFO return code X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b17d39453b40730cbfdb2cab9565f8ba8627b7f8;p=deliverable%2Flinux.git [media] media: fix MEDIA_IOC_DEVICE_INFO return code The MEDIA_IOC_DEVICE_INFO ioctl was returning a positive value rather than a negative error code when failing to copy output parameter to user-space. Tested by compilation only. Signed-off-by: Nicolas Thery Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 6f9eb94e85b3..d01fcb7e87c2 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -59,7 +59,9 @@ static int media_device_get_info(struct media_device *dev, info.hw_revision = dev->hw_revision; info.driver_version = dev->driver_version; - return copy_to_user(__info, &info, sizeof(*__info)); + if (copy_to_user(__info, &info, sizeof(*__info))) + return -EFAULT; + return 0; } static struct media_entity *find_entity(struct media_device *mdev, u32 id)