diff --git a/[refs] b/[refs]
index 48b631547f28..de47813ba0eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6332059e8d4e05ea0e7c813a50f1243dd17dffc0
+refs/heads/master: 0fe688f1383917ab90747fc41e11b393f33c97e8
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 e2d73e1a7ae0..f99015937957 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
@@ -265,7 +265,6 @@ static inline int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed,
 	/* stop feeding if it is last pid */
 	if (adap->feed_count == 0) {
 		dev_dbg(&d->udev->dev, "%s: stop feeding\n", __func__);
-		usb_urb_killv2(&adap->stream);
 
 		if (d->props->streaming_ctrl) {
 			ret = d->props->streaming_ctrl(
@@ -274,9 +273,11 @@ static inline int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed,
 				dev_err(&d->udev->dev, "%s: streaming_ctrl() " \
 						"failed=%d\n", KBUILD_MODNAME,
 						ret);
+				usb_urb_killv2(&adap->stream);
 				goto err_mutex_unlock;
 			}
 		}
+		usb_urb_killv2(&adap->stream);
 		mutex_unlock(&adap->sync_mutex);
 	}