aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/daisy.c
diff options
context:
space:
mode:
authorMarko Kohtala <marko.kohtala@gmail.com>2006-01-06 03:19:47 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:57 -0500
commitb44d3bdd6fcf6233b381bf5bd0893ed235f497a9 (patch)
treeafb1670747d43a8debc9bb299fc37c3e1d105c0c /drivers/parport/daisy.c
parent7c9cc3be1094b267a2da2e0016cbd6ced663da6d (diff)
[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 'drivers/parport/daisy.c')
-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:
144 add_dev (numdevs++, port, -1); 144 add_dev (numdevs++, port, -1);
145 145
146 /* Find out the legacy device's IEEE 1284 device ID. */ 146 /* Find out the legacy device's IEEE 1284 device ID. */
147 deviceid = kmalloc (1000, GFP_KERNEL); 147 deviceid = kmalloc (1024, GFP_KERNEL);
148 if (deviceid) { 148 if (deviceid) {
149 if (parport_device_id (numdevs - 1, deviceid, 1000) > 2) 149 if (parport_device_id (numdevs - 1, deviceid, 1024) > 2)
150 detected++; 150 detected++;
151 151
152 kfree (deviceid); 152 kfree (deviceid);
@@ -508,11 +508,11 @@ static int assign_addrs (struct parport *port)
508 detected); 508 detected);
509 509
510 /* Ask the new devices to introduce themselves. */ 510 /* Ask the new devices to introduce themselves. */
511 deviceid = kmalloc (1000, GFP_KERNEL); 511 deviceid = kmalloc (1024, GFP_KERNEL);
512 if (!deviceid) return 0; 512 if (!deviceid) return 0;
513 513
514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++) 514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++)
515 parport_device_id (thisdev, deviceid, 1000); 515 parport_device_id (thisdev, deviceid, 1024);
516 516
517 kfree (deviceid); 517 kfree (deviceid);
518 return detected; 518 return detected;