Skip to content

Commit

Permalink
[media] mt9m111: move lastpage to struct mt9m111 for multi instances
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Michael Grzeschik authored and Mauro Carvalho Chehab committed Sep 21, 2011
1 parent e553000 commit 096b703
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/media/video/mt9m111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 096b703

Please sign in to comment.