From patchwork Tue Aug 3 09:37:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 4067 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 03 Aug 2010 09:38:49 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 03 Aug 2010 09:28:08 -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 1OgDxQ-0004Ee-RJ; Tue, 03 Aug 2010 09:38:49 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755813Ab0HCJim (ORCPT + 1 other); Tue, 3 Aug 2010 05:38:42 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:58896 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755784Ab0HCJik (ORCPT ); Tue, 3 Aug 2010 05:38:40 -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 1OgDxH-0000zl-06; Tue, 03 Aug 2010 11:38:39 +0200 Received: from mgr by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1OgDxG-0000MC-Oh; Tue, 03 Aug 2010 11:38:38 +0200 From: Michael Grzeschik To: linux-media@vger.kernel.org Cc: baruch@tkos.co.il, g.liakhovetski@gmx.de, s.hauer@pengutronix.de, Michael Grzeschik Subject: [PATCH 1/5] mx2_camera: change to register and probe Date: Tue, 3 Aug 2010 11:37:52 +0200 Message-Id: <1280828276-483-2-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1280828276-483-1-git-send-email-m.grzeschik@pengutronix.de> References: <1280828276-483-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 change this driver back to register and probe, since some platforms first have to initialize an already registered power regulator to switch on the camera. Signed-off-by: Michael Grzeschik --- drivers/media/video/mx2_camera.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 98c93fa..c77a673 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1491,13 +1491,15 @@ static struct platform_driver mx2_camera_driver = { .driver = { .name = MX2_CAM_DRV_NAME, }, + + .probe = mx2_camera_probe, .remove = __devexit_p(mx2_camera_remove), }; static int __init mx2_camera_init(void) { - return platform_driver_probe(&mx2_camera_driver, &mx2_camera_probe); + return platform_driver_register(&mx2_camera_driver); } static void __exit mx2_camera_exit(void)