From 180a8ac36f8a0545cd0b03f8b378dd3afc9ced17 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Fri, 11 Dec 2009 11:34:50 -0300
Subject: [PATCH] --- yaml --- r: 176846 b: refs/heads/master c:
 88a67c51dfc649c18fc8828970cb4fd09d1871b5 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/media/video/tw9910.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 918dfb389be2..4ad3dc4e7a31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d74e5f361bdacfdcfe14220868d562368aaadc2
+refs/heads/master: 88a67c51dfc649c18fc8828970cb4fd09d1871b5
diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c
index e3a4942e0f37..3d8a45f0eb2a 100644
--- a/trunk/drivers/media/video/tw9910.c
+++ b/trunk/drivers/media/video/tw9910.c
@@ -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;