Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e161f817 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Linus Torvalds
Browse files

[PATCH] dvb: usb: dont use HZ for timeouts 



Don't use HZ for usb-transfer-timeouts.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 58769a54

drivers/media/dvb/dvb-usb/dvb-usb-urb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, 




	ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev,

	ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev,

			d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen,

			d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen,

			2*HZ);

			2000);





	if (ret)

	if (ret)

		err("bulk message failed: %d (%d/%d)",ret,wlen,actlen);

		err("bulk message failed: %d (%d/%d)",ret,wlen,actlen);
@@ -43,7 +43,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, 




		ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev,

		ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev,

				d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen,

				d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen,

				2*HZ);

				2000);





		if (ret)

		if (ret)

			err("recv bulk message failed: %d",ret);

			err("recv bulk message failed: %d",ret);