From a97f2429c5d11217bf1994c961dddeb27dd2cb31 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 27 Oct 2012 16:42:05 -0300 Subject: [PATCH] --- yaml --- r: 343863 b: refs/heads/master c: 84cc2377ee72cfa5745fcd26919d4b1aa3e0e9e5 h: refs/heads/master i: 343861: a55991b3a5b6dbd98b013dd3b384e5672b921399 343859: 57aea33ba02db373eb351e2a58f3fe6191c56ff8 343855: be52e049400b0ae7b6cd562bf31c9edb4fcade5a v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/soc_camera.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e582b06e1702..de196c6349e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e7b318fa17a36d8a6d9783c10e845054d8ca27f +refs/heads/master: 84cc2377ee72cfa5745fcd26919d4b1aa3e0e9e5 diff --git a/trunk/drivers/media/platform/soc_camera/soc_camera.c b/trunk/drivers/media/platform/soc_camera/soc_camera.c index d3f0b84e2d70..6f76ada1b2d8 100644 --- a/trunk/drivers/media/platform/soc_camera/soc_camera.c +++ b/trunk/drivers/media/platform/soc_camera/soc_camera.c @@ -1048,10 +1048,8 @@ static void scan_add_host(struct soc_camera_host *ici) list_for_each_entry(icd, &devices, list) { if (icd->iface == ici->nr) { - int ret; - icd->parent = ici->v4l2_dev.dev; - ret = soc_camera_probe(icd); + soc_camera_probe(icd); } }