diff options
Diffstat (limited to 'linux/drivers/media/video/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/philips.txt | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pwc/philips.txt b/linux/drivers/media/video/pwc/philips.txt index 11f751a6b..f5e848410 100644 --- a/linux/drivers/media/video/pwc/philips.txt +++ b/linux/drivers/media/video/pwc/philips.txt @@ -175,8 +175,8 @@ dev_hint - If a device node is already occupied, registration will fail and the webcam is not available. - You can have up to 64 video devices; be sure to make enough device - nodes in /dev if you want to spread the numbers (this does not apply - to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA). + nodes in /dev if you want to spread the numbers. + After /dev/video9 comes /dev/video10 (not /dev/videoA). - If a camera does not match any dev_hint, it will simply get assigned the first available device node, just as it used to be. diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index dd731a8e7..f00a606c5 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -736,7 +736,7 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs) case -EOVERFLOW: errmsg = "Babble (bad cable?)"; break; case -EPROTO: errmsg = "Bit-stuff error (bad cable?)"; break; case -EILSEQ: errmsg = "CRC/Timeout (could be anything)"; break; - case -ETIMEDOUT: errmsg = "NAK (device does not respond)"; break; + case -ETIME: errmsg = "Device does not respond"; break; } PWC_DEBUG_FLOW("pwc_isoc_handler() called with status %d [%s].\n", urb->status, errmsg); /* Give up after a number of contiguous errors on the USB bus. |