[PATCH] v4l: bug fix to correct tea5767 autodetection

This patch does correct radio chip autodetection to avoid misdetecting
mt20xx microtune as tea5767 chip.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Mauro Carvalho Chehab and committed by Linus Torvalds 001abc93 43f2f3d3

+10 -3
+10 -3
drivers/media/video/tea5767.c
··· 2 2 * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview 3 3 * I2C address is allways 0xC0. 4 4 * 5 - * $Id: tea5767.c,v 1.26 2005/07/27 12:00:36 mkrufky Exp $ 5 + * $Id: tea5767.c,v 1.27 2005/07/31 12:10:56 mchehab Exp $ 6 6 * 7 7 * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br) 8 8 * This code is placed under the terms of the GNU General Public License ··· 296 296 int rc; 297 297 struct tuner *t = i2c_get_clientdata(c); 298 298 299 - if (5 != (rc = i2c_master_recv(c, buffer, 5))) { 299 + if (7 != (rc = i2c_master_recv(c, buffer, 7))) { 300 300 tuner_warn("It is not a TEA5767. Received %i bytes.\n", rc); 301 301 return EINVAL; 302 302 } ··· 323 323 return EINVAL; 324 324 } 325 325 326 + /* It seems that tea5767 returns 0xff after the 5th byte */ 327 + if ((buffer[5] != 0xff) || (buffer[6] != 0xff)) { 328 + tuner_warn("Returned more than 5 bytes. It is not a TEA5767\n"); 329 + return EINVAL; 330 + } 331 + 326 332 tuner_warn("TEA5767 detected.\n"); 327 333 return 0; 328 334 } ··· 337 331 { 338 332 struct tuner *t = i2c_get_clientdata(c); 339 333 340 - tuner_info("type set to %d (%s)\n", t->type, "Philips TEA5767HN FM Radio"); 334 + tuner_info("type set to %d (%s)\n", t->type, 335 + "Philips TEA5767HN FM Radio"); 341 336 strlcpy(c->name, "tea5767", sizeof(c->name)); 342 337 343 338 t->tv_freq = set_tv_freq;