From: Hans Verkuil Date: Fri, 2 Feb 2007 23:49:54 +0000 (-0300) Subject: V4L/DVB (5180): Fix cx2584x revision reporting. X-Git-Tag: v2.6.21-rc2~66^2~54 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b7a01e723c9edaefcadb99d42c1409371c01dde1;p=linux-2.6-omap-h63xx.git V4L/DVB (5180): Fix cx2584x revision reporting. Revisions >= 23 were always reported as revision 23. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 92357772329..cc535ca713d 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -887,9 +887,11 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, return 0; } + /* Note: revision '(device_id & 0x0f) == 2' was never built. The + marking skips from 0x1 == 22 to 0x3 == 23. */ v4l_info(client, "cx25%3x-2%x found @ 0x%x (%s)\n", (device_id & 0xfff0) >> 4, - (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : 3, + (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : (device_id & 0x0f), address << 1, adapter->name); i2c_set_clientdata(client, state);