Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / media / pci / bt8xx / bttv-i2c.c

diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
index b7c52dc8999c4f9acfb115f7fde26822dd3328a2..d43911deb617a97a78348bc5e7bdb5f6ee1bf265 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/drivers/media/pci/bt8xx/bttv-i2c.c
@@ -397,8 +397,8 @@ int init_bttv_i2c(struct bttv *btv)
 
 int fini_bttv_i2c(struct bttv *btv)
 {
-       if (0 != btv->i2c_rc)
-               return 0;
+       if (btv->i2c_rc == 0)
+               i2c_del_adapter(&btv->c.i2c_adap);
 
-       return i2c_del_adapter(&btv->c.i2c_adap);
+       return 0;
 }