Skip to contentSkip to conversation

soc-camera: return -ENODEV is sensor is missing

PATCH New Magnus Damm 1 participant 1 message Feb 9, 2010 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc-camera: return -ENODEV is sensor is missing

From: Magnus Damm <[email protected]>

Update the soc-camera i2c code to return -ENODEV if a camera sensor is missing instead of -ENOMEM.

---

 drivers/media/video/soc_camera.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/media/video/soc_camera.c +2 -6
@@ -846,10 +846,8 @@ static int soc_camera_init_i2c(struct so
 	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
 	struct i2c_adapter *adap = i2c_get_adapter(icl->i2c_adapter_id);
 	struct v4l2_subdev *subdev;
-	int ret;
 
 	if (!adap) {
-		ret = -ENODEV;
 		dev_err(&icd->dev, "Cannot get I2C adapter #%d. No driver?\n",
 			icl->i2c_adapter_id);
 		goto ei2cga;
@@ -859,10 +857,8 @@ static int soc_camera_init_i2c(struct so
 
 	subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap,
 				icl->module_name, icl->board_info, NULL);
-	if (!subdev) {
-		ret = -ENOMEM;
+	if (!subdev)
 		goto ei2cnd;
-	}
 
 	client = subdev->priv;
 
@@ -873,7 +869,7 @@ static int soc_camera_init_i2c(struct so
 ei2cnd:
 	i2c_put_adapter(adap);
 ei2cga:
-	return ret;
+	return -ENODEV;
 }
 
 static void soc_camera_free_i2c(struct soc_camera_device *icd)