Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176846
b: refs/heads/master
c: 88a67c5
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Mauro Carvalho Chehab committed Dec 16, 2009
1 parent 5ec6446 commit 180a8ac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d74e5f361bdacfdcfe14220868d562368aaadc2
refs/heads/master: 88a67c51dfc649c18fc8828970cb4fd09d1871b5
13 changes: 7 additions & 6 deletions trunk/drivers/media/video/tw9910.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
Expand Down

0 comments on commit 180a8ac

Please sign in to comment.