From patchwork Tue Jul 19 13:26:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 7027 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 19 Jul 2011 13:27:13 +0000 Received: from casper.infradead.org [85.118.1.10] by localhost.localdomain with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 19 Jul 2011 10:27:25 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QjAKP-0004K5-4A; Tue, 19 Jul 2011 13:27:13 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750971Ab1GSN1K (ORCPT + 1 other); Tue, 19 Jul 2011 09:27:10 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50944 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750893Ab1GSN1J (ORCPT ); Tue, 19 Jul 2011 09:27:09 -0400 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1QjAKK-00046I-ML; Tue, 19 Jul 2011 15:27:08 +0200 Received: from mgr by octopus.hi.pengutronix.de with local (Exim 4.76) (envelope-from ) id 1QjAKK-0006cY-G4; Tue, 19 Jul 2011 15:27:08 +0200 From: Michael Grzeschik To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de Subject: [PATCH v2] mt9m111: move lastpage to struct mt9m111 for multi instances Date: Tue, 19 Jul 2011 15:26:35 +0200 Message-Id: <1311081995-25409-1-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1310485146-27759-3-git-send-email-m.grzeschik@pengutronix.de> References: <1310485146-27759-3-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 Signed-off-by: Michael Grzeschik --- v1 -> v2: added initial value -1 for lastpage drivers/media/video/mt9m111.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index a357aa8..07af26e 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c @@ -184,6 +184,7 @@ struct mt9m111 { struct mutex power_lock; /* lock to protect power_count */ int power_count; const struct mt9m111_datafmt *fmt; + int lastpage; /* PageMap cache value */ unsigned int gain; unsigned char autoexposure; unsigned char datawidth; @@ -202,17 +203,17 @@ static int reg_page_map_set(struct i2c_client *client, const u16 reg) { int ret; u16 page; - static int lastpage = -1; /* PageMap cache value */ + struct mt9m111 *mt9m111 = to_mt9m111(client); page = (reg >> 8); - if (page == lastpage) + if (page == mt9m111->lastpage) return 0; if (page > 2) return -EINVAL; ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page)); if (!ret) - lastpage = page; + mt9m111->lastpage = page; return ret; } @@ -932,6 +933,8 @@ static int mt9m111_video_probe(struct soc_camera_device *icd, BUG_ON(!icd->parent || to_soc_camera_host(icd->parent)->nr != icd->iface); + mt9m111->lastpage = -1; + mt9m111->autoexposure = 1; mt9m111->autowhitebalance = 1;