Commit bf9b7f73 authored by Oliver Neukum's avatar Oliver Neukum Committed by Vojtech Pavlik

input: fixes in wacom.c

  -use GFP_KERNEL where SLAB_ATOMIC is not needed
  -fix count bug in open() error path
parent 7ed82015
...@@ -593,8 +593,10 @@ static int wacom_open(struct input_dev *dev) ...@@ -593,8 +593,10 @@ static int wacom_open(struct input_dev *dev)
return 0; return 0;
wacom->irq->dev = wacom->usbdev; 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 -EIO;
}
return 0; return 0;
} }
...@@ -619,7 +621,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -619,7 +621,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
return -ENOMEM; return -ENOMEM;
memset(wacom, 0, sizeof(struct wacom)); 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) { if (!wacom->data) {
kfree(wacom); kfree(wacom);
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment