Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (13653): tw9910: simplify chip ID calculation

Browse source 
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kuninori Morimoto 2009-12-11 11:34:50 -03:00 committed by Mauro Carvalho Chehab
parent 6d74e5f361
commit 88a67c51df
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/video/tw9910.c
View file

@ -863,7 +863,7 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
struct i2c_client *client)
{
struct tw9910_priv *priv = to_tw9910(client);
s32 val;
s32 id;
/*
* We must have a parent by now. And it cannot be a wrong one.
@ -889,19 +889,20 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
* check and show Product ID
* So far only revisions 0 and 1 have been seen
*/
val = i2c_smbus_read_byte_data(client, ID);
priv->revision = GET_REV(val);
id = i2c_smbus_read_byte_data(client, ID);
priv->revision = GET_REV(id);
id = GET_ID(id);
if (0x0B != GET_ID(val) ||
if (0x0B != id ||
0x01 < priv->revision) {
dev_err(&client->dev,
"Product ID error %x:%x\n",
GET_ID(val), priv->revision);
id, priv->revision);
return -ENODEV;
}
dev_info(&client->dev,
"tw9910 Product ID %0x:%0x\n", GET_ID(val), priv->revision);
"tw9910 Product ID %0x:%0x\n", id, priv->revision);
icd->vdev->tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL;
icd->vdev->current_norm = V4L2_STD_NTSC;