aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/pci/bt8xx/bttv-i2c.c8
-rw-r--r--drivers/media/pci/bt8xx/bttv-input.c8
-rw-r--r--drivers/media/pci/bt8xx/bttvp.h5
3 files changed, 12 insertions, 9 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
index c63c643ed1f8..b7c52dc8999c 100644
--- a/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/drivers/media/pci/bt8xx/bttv-i2c.c
@@ -394,3 +394,11 @@ int init_bttv_i2c(struct bttv *btv)
394 394
395 return btv->i2c_rc; 395 return btv->i2c_rc;
396} 396}
397
398int fini_bttv_i2c(struct bttv *btv)
399{
400 if (0 != btv->i2c_rc)
401 return 0;
402
403 return i2c_del_adapter(&btv->c.i2c_adap);
404}
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index 01c71214f9ec..f36821367d8d 100644
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -415,14 +415,6 @@ void init_bttv_i2c_ir(struct bttv *btv)
415#endif 415#endif
416} 416}
417 417
418int fini_bttv_i2c(struct bttv *btv)
419{
420 if (0 != btv->i2c_rc)
421 return 0;
422
423 return i2c_del_adapter(&btv->c.i2c_adap);
424}
425
426int bttv_input_init(struct bttv *btv) 418int bttv_input_init(struct bttv *btv)
427{ 419{
428 struct bttv_ir *ir; 420 struct bttv_ir *ir;
diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index eb13be7ae3f4..e7910e0ffa05 100644
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -300,6 +300,10 @@ extern int no_overlay;
300/* bttv-input.c */ 300/* bttv-input.c */
301 301
302extern void init_bttv_i2c_ir(struct bttv *btv); 302extern void init_bttv_i2c_ir(struct bttv *btv);
303
304/* ---------------------------------------------------------- */
305/* bttv-i2c.c */
306extern int init_bttv_i2c(struct bttv *btv);
303extern int fini_bttv_i2c(struct bttv *btv); 307extern int fini_bttv_i2c(struct bttv *btv);
304 308
305/* ---------------------------------------------------------- */ 309/* ---------------------------------------------------------- */
@@ -310,7 +314,6 @@ extern unsigned int bttv_verbose;
310extern unsigned int bttv_debug; 314extern unsigned int bttv_debug;
311extern unsigned int bttv_gpio; 315extern unsigned int bttv_gpio;
312extern void bttv_gpio_tracking(struct bttv *btv, char *comment); 316extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
313extern int init_bttv_i2c(struct bttv *btv);
314 317
315#define dprintk(fmt, ...) \ 318#define dprintk(fmt, ...) \
316do { \ 319do { \