2005-09-05 18:33:27

by Marko Kohtala

[permalink] [raw]
Subject: [patch 05/10] parport: ieee1284 fixes and cleanups

Use the complete slab buffer that is allocated by kmalloc.

Signed-off-by: Marko Kohtala <[email protected]>

---

drivers/parport/daisy.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-dvb/drivers/parport/daisy.c
===================================================================
--- linux-dvb.orig/drivers/parport/daisy.c 2005-08-29 20:17:06.000000000 +0300
+++ linux-dvb/drivers/parport/daisy.c 2005-08-29 20:17:26.000000000 +0300
@@ -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);
@@ -508,11 +508,11 @@ static int assign_addrs (struct parport
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;

--