Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / parport / daisy.c

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 9109a40fc8c0e78ebf995d9ce09e29e1cd91fd2e..fd41e28101eaa4b305230fccdaad77392847ab15 100644 (file)
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -144,9 +144,9 @@ again:
        add_dev (numdevs++, port, -1);
 
        /* Find out the legacy device's IEEE 1284 device ID. */
-       deviceid = kmalloc (1000, GFP_KERNEL);
+       deviceid = kmalloc (1024, GFP_KERNEL);
        if (deviceid) {
-               if (parport_device_id (numdevs - 1, deviceid, 1000) > 2)
+               if (parport_device_id (numdevs - 1, deviceid, 1024) > 2)
                        detected++;
 
                kfree (deviceid);
@@ -283,7 +283,7 @@ void parport_close (struct pardevice *dev)
  *
  *     This tries to locate a device on the given parallel port,
  *     multiplexor port and daisy chain address, and returns its
- *     device number or -NXIO if no device with those coordinates
+ *     device number or %-ENXIO if no device with those coordinates
  *     exists.
  **/
 
@@ -508,11 +508,11 @@ static int assign_addrs (struct parport *port)
                 detected);
 
        /* Ask the new devices to introduce themselves. */
-       deviceid = kmalloc (1000, GFP_KERNEL);
+       deviceid = kmalloc (1024, GFP_KERNEL);
        if (!deviceid) return 0;
 
        for (daisy = 0; thisdev < numdevs; thisdev++, daisy++)
-               parport_device_id (thisdev, deviceid, 1000);
+               parport_device_id (thisdev, deviceid, 1024);
 
        kfree (deviceid);
        return detected;