diff options
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 11 |
2 files changed, 15 insertions, 7 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 06b771d6a..79650541f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2006-01-22 03:51 mcisely + + * v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c: + (pvr2_i2c_probe): + + - Eliminate horrid kludge in pvrusb2 involved in detecting tda9887 + client attachment. Use the driver id instead, now that the ID + is being set. + + Signed-off-by: Mike Isely <isely@pobox.com> + 2006-01-22 03:49 mcisely * v4l_experimental/pvrusb2/pvrusb2-i2c-core.c: diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c index dedb1ed24..ff8d38063 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-i2c-chips-v4l2.c,v 1.2 2006/01/14 19:09:50 mcisely Exp $ + * $Id: pvrusb2-i2c-chips-v4l2.c,v 1.3 2006/01/22 03:55:03 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * @@ -71,16 +71,13 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) return; } } - /* This is a really horrid way to identify the tda9887 driver, - however (1) its assigned id is -1 which is completely useless to - us, and (2) perhaps tda9887 is going to disappear soon anyway. - Once it really goes away, then this silly thing here will just - become harmless. */ - if (!strcmp(cp->client->driver->name,"i2c tda9887 driver")) { +#ifdef PVR2_ENABLE_DRIVERID_TDA9887 + if (id == I2C_DRIVERID_TDA9887) { if (pvr2_i2c_demod_setup(hdw,cp)) { return; } } +#endif } |