diff options
| author | Alexander Stein <alexanders83@web.de> | 2014-10-25 14:26:13 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-06-10 15:20:26 +0200 |
| commit | 62db23cfb6e7a4860684be9d328fd8e22b4f193a (patch) | |
| tree | a5bfe9257a2e04491c083167890aaa8b18de9f13 /drivers/w1 | |
| parent | 83de5204d38767e26524ad04e76fdc94ddd61bca (diff) | |
| download | lwn-62db23cfb6e7a4860684be9d328fd8e22b4f193a.tar.gz lwn-62db23cfb6e7a4860684be9d328fd8e22b4f193a.zip | |
W1: ds2490: Increase timeout when waiting for status
commit d25221525e0e2cfd70e4ec7216549c06609a8bd2 upstream.
Adjust the bulk message timeout to the other ones (1000ms). Otherwise the
following dmesg errors can be seen on a Raspberry Pi:
[ 31.492386] Failed to read 1-wire data from 0x81: err=-110.
[ 31.504168] 0x81: count=-110, status:
[ 31.613404] Failed to read 1-wire data from 0x81: err=-110.
[ 31.621915] 0x81: count=-110, status:
[ 43.260968] Failed to read 1-wire data from 0x81: err=-110.
[ 43.270998] 0x81: count=-110, status:
[ 43.379959] Failed to read 1-wire data from 0x81: err=-110.
[ 43.388854] 0x81: count=-110, status:
Signed-off-by: Alexander Stein <alexanders83@web.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/ds2490.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 4f7e1d770f81..dd8b116803d6 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -246,7 +246,7 @@ static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st, memset(st, 0, sizeof(*st)); count = 0; - err = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_STATUS]), buf, size, &count, 100); + err = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_STATUS]), buf, size, &count, 1000); if (err < 0) { printk(KERN_ERR "Failed to read 1-wire data from 0x%x: err=%d.\n", dev->ep[EP_STATUS], err); return err; |