diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/parport/probe.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/parport/probe.c')
| -rw-r--r-- | drivers/parport/probe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index 9cfb00794..6772ea6d8 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c @@ -164,8 +164,9 @@ ssize_t parport_device_id (int devnum, char *buffer, size_t len) retval = parport_read (dev->port, buffer, len); if (retval != len) - printk (KERN_DEBUG "%s: only read %d of %d ID bytes\n", - dev->port->name, retval, len); + printk (KERN_DEBUG "%s: only read %Zd of %Zd ID bytes\n", + dev->port->name, retval, + len); /* Some printer manufacturers mistakenly believe that the length field is supposed to be _exclusive_. */ @@ -179,7 +180,7 @@ ssize_t parport_device_id (int devnum, char *buffer, size_t len) if (diff) printk (KERN_DEBUG "%s: device reported incorrect " - "length field (%d, should be %d)\n", + "length field (%d, should be %Zd)\n", dev->port->name, idlen, retval); else { /* One semi-colon short of a device ID. */ |