From a2d6175225f7cb3b83b5d2cf9ca63b349d82ac19 Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Sun, 19 Jun 2005 13:13:47 +0000 Subject: backport of 2.6.12 changes to match other API changes (i2c, usb) --- linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linux/drivers/media/dvb/ttusb-dec') diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 67fb1a78e..45c9a9a08 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -295,7 +295,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, } result = usb_bulk_msg(dec->udev, dec->command_pipe, b, - COMMAND_PACKET_SIZE + 4, &actual_len, HZ); + COMMAND_PACKET_SIZE + 4, &actual_len, 1000); if (result) { printk("%s: command bulk message failed: error %d\n", @@ -306,7 +306,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, } result = usb_bulk_msg(dec->udev, dec->result_pipe, b, - COMMAND_PACKET_SIZE + 4, &actual_len, HZ); + COMMAND_PACKET_SIZE + 4, &actual_len, 1000); if (result) { printk("%s: result bulk message failed: error %d\n", @@ -1340,12 +1340,12 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) if (j >= ARM_PACKET_SIZE) { result = usb_bulk_msg(dec->udev, dec->command_pipe, b, ARM_PACKET_SIZE, &actual_len, - HZ / 10); + 100); j = 0; } else if (size < COMMAND_PACKET_SIZE) { result = usb_bulk_msg(dec->udev, dec->command_pipe, b, j - COMMAND_PACKET_SIZE + size, - &actual_len, HZ / 10); + &actual_len, 100); } } -- cgit v1.2.3