From de97b22a65d99ea8f60e564f13eb59ceb18807ef Mon Sep 17 00:00:00 2001 From: Nicolas THERY Date: Tue, 7 Aug 2012 05:24:59 -0300 Subject: [PATCH] --- yaml --- r: 330777 b: refs/heads/master c: b17d39453b40730cbfdb2cab9565f8ba8627b7f8 h: refs/heads/master i: 330775: 904a392e477c204c01356ad843681d18b6fd10c6 v: v3 --- [refs] | 2 +- trunk/drivers/media/media-device.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0349303b14fd..7a3ca1a8840e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff54298bc743c42fac205c0fc1b62271682b3668 +refs/heads/master: b17d39453b40730cbfdb2cab9565f8ba8627b7f8 diff --git a/trunk/drivers/media/media-device.c b/trunk/drivers/media/media-device.c index 6f9eb94e85b3..d01fcb7e87c2 100644 --- a/trunk/drivers/media/media-device.c +++ b/trunk/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)