summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-11-06 21:49:45 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-11 12:13:36 +0100
commitb31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21 (patch)
tree289cd2133da9aa4d168e76f5ae0637b8174eedb7 /drivers
parent[media] sp2: sp2_init() can be static (diff)
downloadlinux-b31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21.tar.xz
linux-b31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21.zip
[media] smiapp: Only some selection targets are settable
Setting a non-settable selection target caused BUG() to be called. The check for valid selections only takes the selection target into account, but does not tell whether it may be set, or only get. Fix the issue by simply returning an error to the user. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Cc: stable@vger.kernel.org # for v3.10 and up Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 932ed9be9ff3..b10aaeda2bb4 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2190,7 +2190,7 @@ static int smiapp_set_selection(struct v4l2_subdev *subdev,
ret = smiapp_set_compose(subdev, fh, sel);
break;
default:
- BUG();
+ ret = -EINVAL;
}
mutex_unlock(&sensor->mutex);