leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] mt9m111: move lastpage to struct mt9m111 for multi instances

Browse Source 
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>
This commit is contained in:
Michael Grzeschik 2011-07-19 09:26:35 -03:00 committed by Mauro Carvalho Chehab
parent e553000a14
commit 096b703fb6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/mt9m111.c
View File

@ -184,6 +184,7 @@ struct mt9m111 {
struct mutex power_lock; /* lock to protect power_count */ struct mutex power_lock; /* lock to protect power_count */
int power_count; int power_count;
const struct mt9m111_datafmt *fmt; const struct mt9m111_datafmt *fmt;
int lastpage; /* PageMap cache value */
unsigned int gain; unsigned int gain;
unsigned char autoexposure; unsigned char autoexposure;
unsigned char datawidth; unsigned char datawidth;
@ -202,17 +203,17 @@ static int reg_page_map_set(struct i2c_client *client, const u16 reg)
{ {
int ret; int ret;
u16 page; u16 page;
static int lastpage = -1; /* PageMap cache value */ struct mt9m111 *mt9m111 = to_mt9m111(client);
page = (reg >> 8); page = (reg >> 8);
if (page == lastpage) if (page == mt9m111->lastpage)
return 0; return 0;
if (page > 2) if (page > 2)
return -EINVAL; return -EINVAL;
ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page)); ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));
if (!ret) if (!ret)
lastpage = page; mt9m111->lastpage = page;
return ret; return ret;
} }
@ -932,6 +933,8 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
BUG_ON(!icd->parent || BUG_ON(!icd->parent ||
to_soc_camera_host(icd->parent)->nr != icd->iface); to_soc_camera_host(icd->parent)->nr != icd->iface);
mt9m111->lastpage = -1;
mt9m111->autoexposure = 1; mt9m111->autoexposure = 1;
mt9m111->autowhitebalance = 1; mt9m111->autowhitebalance = 1;