summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarko Kohtala <marko.kohtala@gmail.com>2006-01-06 09:19:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 17:33:57 +0100
commitb44d3bdd6fcf6233b381bf5bd0893ed235f497a9 (patch)
treeafb1670747d43a8debc9bb299fc37c3e1d105c0c /drivers
parent[PATCH] parport: parport_daisy_select return value fix (diff)
downloadlinux-b44d3bdd6fcf6233b381bf5bd0893ed235f497a9.tar.xz
linux-b44d3bdd6fcf6233b381bf5bd0893ed235f497a9.zip
[PATCH] parport: use complete slab buffer
Use the complete slab buffer that is allocated by kmalloc. Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r--drivers/parport/daisy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 9109a40fc8c0..9ee67321b630 100644
--- 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);
@@ -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;