---

yaml --- r: 330604 b: refs/heads/master c: 0fba999 h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 499e9fd · 499e9fd
1 parent 1d1b9c6
commit 499e9fd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77f54517fd5fc3f94486729a74064fbb55f140b8
+refs/heads/master: 0fba999f13b7480278946be4b51db4a1035e7f4f
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -70,10 +70,12 @@ int dvb_usbv2_download_firmware(struct dvb_usb_device *d)
 
 int dvb_usbv2_i2c_init(struct dvb_usb_device *d)
 {
-	int ret = 0;
+	int ret;
 
-	if (!d->props.i2c_algo)
-		return 0;
+	if (!d->props.i2c_algo) {
+		ret = 0;
+		goto err;
+	}
 
 	strlcpy(d->i2c_adap.name, d->name, sizeof(d->i2c_adap.name));
 	d->i2c_adap.algo = d->props.i2c_algo;
@@ -83,19 +85,26 @@ int dvb_usbv2_i2c_init(struct dvb_usb_device *d)
 	i2c_set_adapdata(&d->i2c_adap, d);
 
 	ret = i2c_add_adapter(&d->i2c_adap);
-	if (ret < 0)
-		pr_err("%s: could not add i2c adapter\n", KBUILD_MODNAME);
+	if (ret < 0) {
+		pr_err("%s: i2c_add_adapter() failed\n", KBUILD_MODNAME);
+		goto err;
+	}
 
 	d->state |= DVB_USB_STATE_I2C;
 
+	return 0;
+err:
+	pr_debug("%s: failed=%d\n", __func__, ret);
 	return ret;
 }
 
 int dvb_usbv2_i2c_exit(struct dvb_usb_device *d)
 {
 	if (d->state & DVB_USB_STATE_I2C)
 		i2c_del_adapter(&d->i2c_adap);
+
 	d->state &= ~DVB_USB_STATE_I2C;
+
 	return 0;
 }