[PATCH] fix for race problem in DVB USB drivers (dibusb)

Patrick Boettcher · Linus Torvalds · commit 8126fdbc7635 · 2005-08-27T11:03:45.000-07:00
Fixed race between submitting streaming URBs in the driver and starting
the actual transfer in hardware (demodulator and USB controller) which
sometimes lead to garbled data transfers. URBs are now submitted first,
then the transfer is enabled. Dibusb devices and clones are now fully
functional again.

Signed-off-by: Patrick Boettcher &lt;pb@linuxtv.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -70,13 +70,22 @@ EXPORT_SYMBOL(dibusb_power_ctrl);
 
 int dibusb2_0_streaming_ctrl(struct dvb_usb_device *d, int onoff)
 {
-	u8 b[2];
-	b[0] = DIBUSB_REQ_SET_IOCTL;
-	b[1] = onoff ? DIBUSB_IOCTL_CMD_ENABLE_STREAM : DIBUSB_IOCTL_CMD_DISABLE_STREAM;
+	u8 b[3] = { 0 };
+	int ret;
+
+	if ((ret = dibusb_streaming_ctrl(d,onoff)) < 0)
+		return ret;
 
-	dvb_usb_generic_write(d,b,3);
+	if (onoff) {
+		b[0] = DIBUSB_REQ_SET_STREAMING_MODE;
+		b[1] = 0x00;
+		if ((ret = dvb_usb_generic_write(d,b,2)) < 0)
+			return ret;
+	}
 
-	return dibusb_streaming_ctrl(d,onoff);
+	b[0] = DIBUSB_REQ_SET_IOCTL;
+	b[1] = onoff ? DIBUSB_IOCTL_CMD_ENABLE_STREAM : DIBUSB_IOCTL_CMD_DISABLE_STREAM;
+	return dvb_usb_generic_write(d,b,3);
 }
 EXPORT_SYMBOL(dibusb2_0_streaming_ctrl);
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -23,12 +23,12 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 	 */
 	if (newfeedcount == 0) {
 		deb_ts("stop feeding\n");
+		dvb_usb_urb_kill(d);
 
 		if (d->props.streaming_ctrl != NULL)
 			if ((ret = d->props.streaming_ctrl(d,0)))
 				err("error while stopping stream.");
 
-		dvb_usb_urb_kill(d);
 	}
 
 	d->feedcount = newfeedcount;
@@ -44,6 +44,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 	 * for reception.
 	 */
 	if (d->feedcount == onoff && d->feedcount > 0) {
+		deb_ts("submitting all URBs\n");
+		dvb_usb_urb_submit(d);
 
 		deb_ts("controlling pid parser\n");
 		if (d->props.caps & DVB_USB_HAS_PID_FILTER &&
@@ -59,7 +61,6 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 				return -ENODEV;
 			}
 
-		dvb_usb_urb_submit(d);
 	}
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)`
`23`	`23`	`*/`
`24`	`24`	`if (newfeedcount == 0) {`
`25`	`25`	`deb_ts("stop feeding\n");`
	`26`	`+ dvb_usb_urb_kill(d);`
`26`	`27`
`27`	`28`	`if (d->props.streaming_ctrl != NULL)`
`28`	`29`	`if ((ret = d->props.streaming_ctrl(d,0)))`
`29`	`30`	`err("error while stopping stream.");`
`30`	`31`
`31`		`- dvb_usb_urb_kill(d);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`d->feedcount = newfeedcount;`
`@@ -44,6 +44,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)`
`44`	`44`	`* for reception.`
`45`	`45`	`*/`
`46`	`46`	`if (d->feedcount == onoff && d->feedcount > 0) {`
	`47`	`+ deb_ts("submitting all URBs\n");`
	`48`	`+ dvb_usb_urb_submit(d);`
`47`	`49`
`48`	`50`	`deb_ts("controlling pid parser\n");`
`49`	`51`	`if (d->props.caps & DVB_USB_HAS_PID_FILTER &&`
`@@ -59,7 +61,6 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)`
`59`	`61`	`return -ENODEV;`
`60`	`62`	`}`
`61`	`63`
`62`		`- dvb_usb_urb_submit(d);`
`63`	`64`	`}`
`64`	`65`	`return 0;`
`65`	`66`	`}`