diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-14 14:35:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:26:04 -0700 |
| commit | 548c278c6caff2fd7b84fb985bcfda5bc1de8793 (patch) | |
| tree | 223f2c6fc7241154de836431b11254451b974af6 | |
| parent | df7f64e481f259baa44b61379b5052479b33af14 (diff) | |
staging: comedi: dt9812: usb_bulk_msg() timeout is in milliseconds
The timeout values passed to usb_bulk_msg() should be in milliseconds
not jiffies.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/dt9812.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index 99f487283174..9281d49dbdeb 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c @@ -52,6 +52,9 @@ for my needs. #define DT9812_MAX_WRITE_CMD_PIPE_SIZE 32 #define DT9812_MAX_READ_CMD_PIPE_SIZE 32 +/* usb_bulk_msg() timout in milliseconds */ +#define DT9812_USB_TIMEOUT 1000 + /* * See Silican Laboratories C8051F020/1/2/3 manual */ @@ -262,12 +265,12 @@ static int dt9812_read_info(struct comedi_device *dev, /* DT9812 only responds to 32 byte writes!! */ ret = usb_bulk_msg(usb, usb_sndbulkpipe(usb, devpriv->cmd_wr.addr), - &cmd, 32, &count, HZ * 1); + &cmd, 32, &count, DT9812_USB_TIMEOUT); if (ret) return ret; return usb_bulk_msg(usb, usb_rcvbulkpipe(usb, devpriv->cmd_rd.addr), - buf, buf_size, &count, HZ * 1); + buf, buf_size, &count, DT9812_USB_TIMEOUT); } static int dt9812_read_multiple_registers(struct comedi_device *dev, @@ -287,12 +290,12 @@ static int dt9812_read_multiple_registers(struct comedi_device *dev, /* DT9812 only responds to 32 byte writes!! */ ret = usb_bulk_msg(usb, usb_sndbulkpipe(usb, devpriv->cmd_wr.addr), - &cmd, 32, &count, HZ * 1); + &cmd, 32, &count, DT9812_USB_TIMEOUT); if (ret) return ret; return usb_bulk_msg(usb, usb_rcvbulkpipe(usb, devpriv->cmd_rd.addr), - value, reg_count, &count, HZ * 1); + value, reg_count, &count, DT9812_USB_TIMEOUT); } static int dt9812_write_multiple_registers(struct comedi_device *dev, @@ -314,7 +317,7 @@ static int dt9812_write_multiple_registers(struct comedi_device *dev, /* DT9812 only responds to 32 byte writes!! */ return usb_bulk_msg(usb, usb_sndbulkpipe(usb, devpriv->cmd_wr.addr), - &cmd, 32, &count, HZ * 1); + &cmd, 32, &count, DT9812_USB_TIMEOUT); } static int dt9812_rmw_multiple_registers(struct comedi_device *dev, @@ -334,7 +337,7 @@ static int dt9812_rmw_multiple_registers(struct comedi_device *dev, /* DT9812 only responds to 32 byte writes!! */ return usb_bulk_msg(usb, usb_sndbulkpipe(usb, devpriv->cmd_wr.addr), - &cmd, 32, &count, HZ * 1); + &cmd, 32, &count, DT9812_USB_TIMEOUT); } static int dt9812_digital_in(struct comedi_device *dev, u8 *bits) |