From patchwork Fri Jul 30 14:53:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 4016 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 30 Jul 2010 14:54:56 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 30 Jul 2010 11:57:21 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OeqzA-0001UN-2a; Fri, 30 Jul 2010 14:54:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238Ab0G3Oyy (ORCPT + 1 other); Fri, 30 Jul 2010 10:54:54 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:51740 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751970Ab0G3OyT (ORCPT ); Fri, 30 Jul 2010 10:54:19 -0400 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.71) (envelope-from ) id 1OeqyW-0000ay-Ur; Fri, 30 Jul 2010 16:54:16 +0200 Received: from mgr by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1OeqyW-0004MU-O5; Fri, 30 Jul 2010 16:54:16 +0200 From: Michael Grzeschik To: linux-media@vger.kernel.org Cc: robert.jarzmik@free.fr, g.liakhovetski@gmx.de, p.wiesner@phytec.de, Michael Grzeschik Subject: [PATCH 02/20] mt9m111: init chip after read CHIP_VERSION Date: Fri, 30 Jul 2010 16:53:20 +0200 Message-Id: <1280501618-23634-3-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1280501618-23634-1-git-send-email-m.grzeschik@pengutronix.de> References: <1280501618-23634-1-git-send-email-m.grzeschik@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Moved mt9m111_init after the chip version detection passage: I don't like the idea of writing on a device we haven't identified yet. Signed-off-by: Philipp Wiesner Signed-off-by: Michael Grzeschik --- drivers/media/video/mt9m111.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index e934559..39dff7c 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c @@ -969,10 +969,6 @@ static int mt9m111_video_probe(struct soc_camera_device *icd, mt9m111->swap_rgb_even_odd = 1; mt9m111->swap_rgb_red_blue = 1; - ret = mt9m111_init(client); - if (ret) - goto ei2c; - data = reg_read(CHIP_VERSION); switch (data) { @@ -994,6 +990,8 @@ static int mt9m111_video_probe(struct soc_camera_device *icd, goto ei2c; } + ret = mt9m111_init(client); + ei2c: return ret; }