[PATCH 44/44] Fixes in wacom.c: SLAB_ATOMIC->GFP_KERNEL and count bug in open()
From: Vojtech Pavlik
Date: Tue Mar 16 2004 - 12:41:52 EST
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/input
===================================================================
ChangeSet@xxxxxxxxxxx, 2004-03-12 13:51:14+01:00, oliver@xxxxxxxxxx
input: fixes in wacom.c
-use GFP_KERNEL where SLAB_ATOMIC is not needed
-fix count bug in open() error path
wacom.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
===================================================================
diff -Nru a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
--- a/drivers/usb/input/wacom.c Tue Mar 16 13:17:23 2004
+++ b/drivers/usb/input/wacom.c Tue Mar 16 13:17:23 2004
@@ -593,8 +593,10 @@
return 0;
wacom->irq->dev = wacom->usbdev;
- if (usb_submit_urb(wacom->irq, GFP_KERNEL))
+ if (usb_submit_urb(wacom->irq, GFP_KERNEL)) {
+ wacom->open--;
return -EIO;
+ }
return 0;
}
@@ -619,7 +621,7 @@
return -ENOMEM;
memset(wacom, 0, sizeof(struct wacom));
- wacom->data = usb_buffer_alloc(dev, 10, SLAB_ATOMIC, &wacom->data_dma);
+ wacom->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &wacom->data_dma);
if (!wacom->data) {
kfree(wacom);
return -ENOMEM;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/