diff --git a/[refs] b/[refs]
index cd365d621f26..c050385f54fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0921af7eb2eced1639fc1e1befdf703e7bec95a
+refs/heads/master: 5cd983200ae8cba06d6ff5f515f741a654b62cf1
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
index aecba307105e..2bef8f4ab71a 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -360,7 +360,6 @@ struct dvb_usb_device {
 	struct mutex i2c_mutex;
 	struct i2c_adapter i2c_adap;
 
-	int num_adapters_initialized;
 	struct dvb_usb_adapter adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
 
 	/* remote control */
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 24e1f2970d8e..1d92d831ab27 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -270,8 +270,6 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
 			adap->dvb_adap.mfe_shared = 1;
 
 		adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override;
-
-		d->num_adapters_initialized++;
 	}
 
 	return 0;
@@ -292,8 +290,6 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d)
 		dvb_usbv2_adapter_stream_exit(&d->adapter[i]);
 	}
 
-	d->num_adapters_initialized = 0;
-
 	return 0;
 }
 
@@ -551,8 +547,9 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
 		cancel_delayed_work_sync(&d->rc_query_work);
 
 	/* stop streaming */
-	for (i = d->num_adapters_initialized - 1; i >= 0; i--) {
-		if (d->adapter[i].active_fe != -1)
+	for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) {
+		if (d->adapter[i].dvb_adap.priv &&
+				d->adapter[i].active_fe != -1)
 			usb_urb_killv2(&d->adapter[i].stream);
 	}
 
@@ -568,8 +565,9 @@ int dvb_usbv2_resume(struct usb_interface *intf)
 	pr_debug("%s:\n", __func__);
 
 	/* start streaming */
-	for (i = 0; i < d->num_adapters_initialized; i++) {
-		if (d->adapter[i].active_fe != -1)
+	for (i = 0; i < MAX_NO_OF_ADAPTER_PER_DEVICE; i++) {
+		if (d->adapter[i].dvb_adap.priv &&
+				d->adapter[i].active_fe != -1)
 			usb_urb_submitv2(&d->adapter[i].stream, NULL);
 	}