---

yaml --- r: 330622 b: refs/heads/master c: 2cc53dc h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 7ec9f8b · 7ec9f8b
1 parent ffd8209
commit 7ec9f8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec04745790f47f23f558f07398fe69e963744f11
+refs/heads/master: 2cc53dc82868c8d425825dbfe6d6fbf6a972486d
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -359,15 +359,6 @@ int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 		goto err;
 	}
 
-	if (adap->dev->props->tuner_attach) {
-		ret = adap->dev->props->tuner_attach(adap);
-		if (ret < 0) {
-			pr_debug("%s: tuner_attach() failed=%d\n", __func__,
-					ret);
-			goto err_dvb_frontend_detach;
-		}
-	}
-
 	for (i = 0; i < MAX_NO_OF_FE_PER_ADAP && adap->fe[i]; i++) {
 		adap->fe[i]->id = i;
 
@@ -387,6 +378,15 @@ int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 		count_registered++;
 	}
 
+	if (adap->dev->props->tuner_attach) {
+		ret = adap->dev->props->tuner_attach(adap);
+		if (ret < 0) {
+			pr_debug("%s: tuner_attach() failed=%d\n", __func__,
+					ret);
+			goto err_dvb_unregister_frontend;
+		}
+	}
+
 	adap->num_frontends_initialized = count_registered;
 
 	return 0;