summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-04-18 23:35:23 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-31 07:28:58 +0100
commit507fcd3da2a28b5342cd0e3eea69b886741adb60 (patch)
treea9f2abbc5d34020a5a3b88faa4520d98cd1902eb /drivers/media
parent[media] V4L2: (cosmetic) remove redundant use of unlikely() (diff)
downloadlinux-507fcd3da2a28b5342cd0e3eea69b886741adb60.tar.xz
linux-507fcd3da2a28b5342cd0e3eea69b886741adb60.zip
[media] imx074: fix error handling for failed async subdevice registration
If v4l2_async_register_subdev() fails, don't skip the clean up. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/soc_camera/imx074.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index 1d384a371b41..5b915936c3f3 100644
--- a/drivers/media/i2c/soc_camera/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
@@ -451,7 +451,9 @@ static int imx074_probe(struct i2c_client *client,
if (ret < 0)
goto eprobe;
- return v4l2_async_register_subdev(&priv->subdev);
+ ret = v4l2_async_register_subdev(&priv->subdev);
+ if (!ret)
+ return 0;
epwrinit:
eprobe: