Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 21 insertions, 10 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index df1ec3e69f4a..b3cb626ed56e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -12,7 +12,7 @@
 static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 {
         struct dvb_usb_adapter *adap = dvbdmxfeed->demux->priv;
-        int newfeedcount,ret;
+        int newfeedcount, ret;
 
         if (adap == NULL)
                 return -ENODEV;
@@ -24,9 +24,13 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
                 deb_ts("stop feeding\n");
                 usb_urb_kill(&adap->stream);
 
-                if (adap->props.streaming_ctrl != NULL)
-                        if ((ret = adap->props.streaming_ctrl(adap,0)))
+                if (adap->props.streaming_ctrl != NULL) {
+                        ret = adap->props.streaming_ctrl(adap, 0);
+                        if (ret < 0) {
                                 err("error while stopping stream.");
+                                return ret;
+                        }
+                }
         }
 
         adap->feedcount = newfeedcount;
@@ -49,17 +53,24 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 
                 deb_ts("controlling pid parser\n");
                 if (adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER &&
-                        adap->props.caps & DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&
-                        adap->props.pid_filter_ctrl != NULL)
-                        if (adap->props.pid_filter_ctrl(adap,adap->pid_filtering) < 0)
+                        adap->props.caps &
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&
+                        adap->props.pid_filter_ctrl != NULL) {
+                        ret = adap->props.pid_filter_ctrl(adap,
+                                adap->pid_filtering);
+                        if (ret < 0) {
                                 err("could not handle pid_parser");
-
+                                return ret;
+                        }
+                }
                 deb_ts("start feeding\n");
-                if (adap->props.streaming_ctrl != NULL)
-                        if (adap->props.streaming_ctrl(adap,1)) {
+                if (adap->props.streaming_ctrl != NULL) {
+                        ret = adap->props.streaming_ctrl(adap, 1);
+                        if (ret < 0) {
                                 err("error while enabling fifo.");
-                                return -ENODEV;
+                                return ret;
                         }
+                }
 
         }
         return 0;