diff --git a/[refs] b/[refs]
index c76f9eec3115..e564ea92109e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b5d01e9f66446be0c2beebfab0463210bed315d
+refs/heads/master: 2d04c13a507f5a01daa7422cd52250809573cfdb
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index 460b5ae1a45d..038679bd4956 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -17,7 +17,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 	if (adap == NULL)
 		return -ENODEV;
 
-	if (adap->active_fe < 0) {
+	if ((adap->active_fe < 0) ||
+	    (adap->active_fe >= adap->num_frontends_initialized)) {
 		return -EINVAL;
 	}