diff options
| author | Mike Isely <devnull@localhost> | 2005-11-27 23:01:16 +0000 |
|---|---|---|
| committer | Mike Isely <devnull@localhost> | 2005-11-27 23:01:16 +0000 |
| commit | 5eee74c9dab4a2cb88a52ae96fa90fe0d2658a1e (patch) | |
| tree | 9b0c06c9e42360d79620f9f52b6475551337f2b9 /v4l_experimental/pvrusb2/pvrusb2-i2c.c | |
| parent | 85af92b0d83f8f1de9fc774046b3c7e16fc14ac5 (diff) | |
| download | mediapointer-dvb-s2-5eee74c9dab4a2cb88a52ae96fa90fe0d2658a1e.tar.gz mediapointer-dvb-s2-5eee74c9dab4a2cb88a52ae96fa90fe0d2658a1e.tar.bz2 | |
Pull in changes from 20051126 pvrusb2 snapshot
From: Mike Isely <isely@pobox.com>
- Rework various things to play nicer in native v4l environment
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l_experimental/pvrusb2/pvrusb2-i2c.c')
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-i2c.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c.c b/v4l_experimental/pvrusb2/pvrusb2-i2c.c index d5cb7467a..fe3ca04f5 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-i2c.c +++ b/v4l_experimental/pvrusb2/pvrusb2-i2c.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-i2c.c,v 1.1 2005/11/14 13:31:24 mchehab Exp $ + * $Id: pvrusb2-i2c.c,v 1.2 2005/11/27 23:01:16 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * @@ -286,10 +286,18 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client) hdw->i2c_tuner_client = client; pvr2_tuner_set_type(hdw); } +#ifdef PVR2_ENABLE_SAA7115 if (!(hdw->i2c_video_client) && (id == I2C_DRIVERID_SAA7115)) { trace_i2c("attaching saa7115 I2C client"); hdw->i2c_video_client = client; } +#endif +#ifndef PVR2_SUPPRESS_SAA711X + if (!(hdw->i2c_video_client) && (id == I2C_DRIVERID_SAA711X)) { + trace_i2c("attaching saa711x I2C client"); + hdw->i2c_video_client = client; + } +#endif if (!(hdw->i2c_tveeprom_client) && (id == I2C_DRIVERID_TVEEPROM)) { trace_i2c("attaching tveeprom I2C client"); hdw->i2c_tveeprom_client = client; @@ -358,7 +366,7 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client) hdw->i2c_tuner_client = 0; } if (hdw->i2c_video_client == client) { - trace_i2c("detaching saa7115 I2C client"); + trace_i2c("detaching saa7115 / saa711x I2C client"); hdw->i2c_video_client = 0; } if (hdw->i2c_tveeprom_client == client) { |