diff --git a/[refs] b/[refs]
index d2d76fa155da..917905695087 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 132f56fb3c83c032cd75cd99c2967905e65f8684
+refs/heads/master: 2a858486e0406110541e13f07d00665ee0c08a54
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index f99015937957..9859d2a2449b 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -612,8 +612,10 @@ int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 
 err_dvb_frontend_detach:
 	for (i = MAX_NO_OF_FE_PER_ADAP - 1; i >= 0; i--) {
-		if (adap->fe[i])
+		if (adap->fe[i]) {
 			dvb_frontend_detach(adap->fe[i]);
+			adap->fe[i] = NULL;
+		}
 	}
 
 err: