---

yaml --- r: 37390 b: refs/heads/master c: 0f69e7f h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · 6a83459 · 6a83459
1 parent 18fea4c
commit 6a83459
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e66c97c9299d53f1d9167e42b05357f023099c8
+refs/heads/master: 0f69e7f3f5256ab392fc44e7340777348b5da2cd
diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -230,19 +230,16 @@ static struct dib3000mc_config mod3000p_dib3000p_config = {
 
 int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
 {
-	int ret;
-	if ((ret = dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe)) != 0)
-		return ret;
-
-	if ((ret = dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe)) != 0)
-		return ret;
-
-	if (d->priv != NULL) {
-		struct dibusb_state *st = d->priv;
-		st->ops.pid_parse = dib3000mc_pid_parse;
-		st->ops.pid_ctrl  = dib3000mc_pid_control;
+	if (dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0 ||
+		dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0) {
+		if (d->priv != NULL) {
+			struct dibusb_state *st = d->priv;
+			st->ops.pid_parse = dib3000mc_pid_parse;
+			st->ops.pid_ctrl  = dib3000mc_pid_control;
+		}
+		return 0;
 	}
-	return 0;
+	return -ENODEV;
 }
 EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);