summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2011-04-17 21:55:14 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 14:28:54 +0200
commitdca6b74bb332f6aa52bd2a6efc464233e542297b (patch)
treeb2a397e0e27fbeef921ebfd79a9254b8008144f9
parent[media] dvb-usb return device errors to demuxer (diff)
downloadlinux-dca6b74bb332f6aa52bd2a6efc464233e542297b.tar.xz
linux-dca6b74bb332f6aa52bd2a6efc464233e542297b.zip
[media] dvb-usb: don't return error if stream stop
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-dvb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index 965698b2d974..b3cb626ed56e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -26,9 +26,10 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
if (adap->props.streaming_ctrl != NULL) {
ret = adap->props.streaming_ctrl(adap, 0);
- err("error while stopping stream.");
- if (ret < 0)
+ if (ret < 0) {
+ err("error while stopping stream.");
return ret;
+ }
}
}