summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-11-06 17:49:45 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-11 09:13:36 -0200
commitb31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21 (patch)
tree289cd2133da9aa4d168e76f5ae0637b8174eedb7
parent167921cb0ff2bdbf25138dad799fec88c99ed316 (diff)
downloadlinux-stable-b31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21.tar.gz
linux-stable-b31eb901c4e5eeef4c83c43dfbc7fe0d4348cb21.tar.bz2
linux-stable-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>
-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);