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-budget/dvb-ttusb-budget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/dvb/ttusb-budget') diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index ec50cc9b5..afa0e7a0e 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -152,7 +152,7 @@ static int ttusb_cmd(struct ttusb *ttusb, return -EAGAIN; err = usb_bulk_msg(ttusb->dev, ttusb->bulk_out_pipe, - (u8 *) data, len, &actual_len, HZ); + (u8 *) data, len, &actual_len, 1000); if (err != 0) { dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n", __FUNCTION__, err); @@ -167,7 +167,7 @@ static int ttusb_cmd(struct ttusb *ttusb, } err = usb_bulk_msg(ttusb->dev, ttusb->bulk_in_pipe, - ttusb->last_result, 32, &actual_len, HZ); + ttusb->last_result, 32, &actual_len, 1000); if (err != 0) { printk("%s: failed, receive error %d\n", __FUNCTION__, @@ -242,7 +242,7 @@ static int ttusb_i2c_msg(struct ttusb *ttusb, return rcv_len; } -static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) +static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) { struct ttusb *ttusb = i2c_get_adapdata(adapter); int i = 0; -- cgit v1.2.3