From 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Apr 2001 04:55:58 +0000 Subject: Merge with Linux 2.4.3. Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels. --- drivers/usb/dc2xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/usb/dc2xx.c') diff --git a/drivers/usb/dc2xx.c b/drivers/usb/dc2xx.c index cb785e26d..ca6d41301 100644 --- a/drivers/usb/dc2xx.c +++ b/drivers/usb/dc2xx.c @@ -174,7 +174,7 @@ static ssize_t camera_read (struct file *file, usb_rcvbulkpipe (camera->dev, camera->inEP), camera->buf, len, &count, HZ*10); - dbg ("read (%d) - 0x%x %d", len, retval, count); + dbg ("read (%Zd) - 0x%x %d", len, retval, count); if (!retval) { if (copy_to_user (buf, camera->buf, count)) @@ -187,7 +187,7 @@ static ssize_t camera_read (struct file *file, break; interruptible_sleep_on_timeout (&camera->wait, RETRY_TIMEOUT); - dbg ("read (%d) - retry", len); + dbg ("read (%Zd) - retry", len); } up (&camera->sem); return retval; @@ -271,7 +271,7 @@ static ssize_t camera_write (struct file *file, } done: up (&camera->sem); - dbg ("wrote %d", bytes_written); + dbg ("wrote %Zd", bytes_written); return bytes_written; } -- cgit v1.2.3