---

yaml --- r: 330862 b: refs/heads/master c: 37ad4e7 h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · 4be1527 · 4be1527
1 parent d1ee73c
commit 4be1527
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c3fb08b3f74b8792004095a1f6881a3296ff643
+refs/heads/master: 37ad4e734bbc27ad1bec2d1cc3ffaa79b1def262
diff --git a/trunk/drivers/media/platform/soc_camera.c b/trunk/drivers/media/platform/soc_camera.c
@@ -1146,10 +1146,6 @@ static int soc_camera_probe(struct soc_camera_device *icd)
 	if (ret < 0)
 		goto evidstart;
 
-	ret = v4l2_subdev_call(sd, core, s_power, 1);
-	if (ret < 0 && ret != -ENOIOCTLCMD)
-		goto esdpwr;
-
 	/* Try to improve our guess of a reasonable window format */
 	if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) {
 		icd->user_width		= mf.width;
@@ -1166,8 +1162,6 @@ static int soc_camera_probe(struct soc_camera_device *icd)
 
 	return 0;
 
-esdpwr:
-	video_unregister_device(icd->vdev);
 evidstart:
 	mutex_unlock(&icd->video_lock);
 	soc_camera_free_user_formats(icd);