From patchwork Fri Jul 8 20:50:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 957382 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p68KqGDG006956 for ; Fri, 8 Jul 2011 20:52:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753706Ab1GHUwK (ORCPT ); Fri, 8 Jul 2011 16:52:10 -0400 Received: from tex.lwn.net ([70.33.254.29]:36261 "EHLO vena.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657Ab1GHUwJ (ORCPT ); Fri, 8 Jul 2011 16:52:09 -0400 Received: from localhost.localdomain (c-71-196-136-137.hsd1.co.comcast.net [71.196.136.137]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by vena.lwn.net (Postfix) with ESMTP id 89FC31540050; Fri, 8 Jul 2011 14:52:08 -0600 (MDT) From: Jonathan Corbet To: linux-media@vger.kernel.org Cc: Marek Szyprowski , Kassey Lee , Mauro Carvalho Chehab , Jonathan Corbet Subject: [PATCH 4/6] marvell-cam: power down mmp camera on registration failure Date: Fri, 8 Jul 2011 14:50:48 -0600 Message-Id: <1310158250-168899-5-git-send-email-corbet@lwn.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1310158250-168899-1-git-send-email-corbet@lwn.net> References: <1310158250-168899-1-git-send-email-corbet@lwn.net> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 08 Jul 2011 20:52:17 +0000 (UTC) If registration does not work, we don't want to leave the sensor powered on. Signed-off-by: Jonathan Corbet --- drivers/media/video/marvell-ccic/mmp-driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c index 8415915..d6b7645 100644 --- a/drivers/media/video/marvell-ccic/mmp-driver.c +++ b/drivers/media/video/marvell-ccic/mmp-driver.c @@ -267,8 +267,8 @@ static int mmpcam_probe(struct platform_device *pdev) out_unregister: mccic_shutdown(mcam); - mmpcam_power_down(mcam); out_gpio2: + mmpcam_power_down(mcam); gpio_free(pdata->sensor_reset_gpio); out_gpio: gpio_free(pdata->sensor_power_gpio);