diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-03-24 09:07:56 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-03-24 09:07:56 +0100 |
| commit | 9bf2b9b868cce9002b2e993e6014e40f0638e920 (patch) | |
| tree | dc774777beed4b8078bd18c30f2c4037b72b583c /linux/drivers/media/video/hdpvr/hdpvr-core.c | |
| parent | 7218ee25243cf0fb19b66fb1068a900bb49ba9d6 (diff) | |
| parent | a5118d42e7e2f3428a63605e6de010d17843d61e (diff) | |
| download | mediapointer-dvb-s2-9bf2b9b868cce9002b2e993e6014e40f0638e920.tar.gz mediapointer-dvb-s2-9bf2b9b868cce9002b2e993e6014e40f0638e920.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/hdpvr/hdpvr-core.c')
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/hdpvr/hdpvr-core.c b/linux/drivers/media/video/hdpvr/hdpvr-core.c index 4a2bbb72b..e96aed42d 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-core.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-core.c @@ -348,13 +348,14 @@ static int hdpvr_probe(struct usb_interface *interface, goto error; } -#if 0 /* until i2c is working properly */ - retval = hdpvr_register_i2c_adapter(dev); +#ifdef CONFIG_I2C + /* until i2c is working properly */ + retval = 0; /* hdpvr_register_i2c_adapter(dev); */ if (retval < 0) { err("registering i2c adapter failed"); goto error; } -#endif +#endif /* CONFIG_I2C */ /* save our data pointer in this interface device */ usb_set_intfdata(interface, dev); @@ -396,12 +397,14 @@ static void hdpvr_disconnect(struct usb_interface *interface) mutex_unlock(&dev->io_mutex); /* deregister I2C adapter */ +#ifdef CONFIG_I2C mutex_lock(&dev->i2c_mutex); if (dev->i2c_adapter) i2c_del_adapter(dev->i2c_adapter); kfree(dev->i2c_adapter); dev->i2c_adapter = NULL; mutex_unlock(&dev->i2c_mutex); +#endif /* CONFIG_I2C */ atomic_dec(&dev_nr); |