diff options
Diffstat (limited to 'drivers/usb/input/usbmouse.c')
-rw-r--r-- | drivers/usb/input/usbmouse.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c index cbbbea332ed7..64a33e420cfb 100644 --- a/drivers/usb/input/usbmouse.c +++ b/drivers/usb/input/usbmouse.c | |||
@@ -86,7 +86,7 @@ static void usb_mouse_irq(struct urb *urb) | |||
86 | 86 | ||
87 | input_sync(dev); | 87 | input_sync(dev); |
88 | resubmit: | 88 | resubmit: |
89 | status = usb_submit_urb (urb, SLAB_ATOMIC); | 89 | status = usb_submit_urb (urb, GFP_ATOMIC); |
90 | if (status) | 90 | if (status) |
91 | err ("can't resubmit intr, %s-%s/input0, status %d", | 91 | err ("can't resubmit intr, %s-%s/input0, status %d", |
92 | mouse->usbdev->bus->bus_name, | 92 | mouse->usbdev->bus->bus_name, |
@@ -126,9 +126,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i | |||
126 | return -ENODEV; | 126 | return -ENODEV; |
127 | 127 | ||
128 | endpoint = &interface->endpoint[0].desc; | 128 | endpoint = &interface->endpoint[0].desc; |
129 | if (!(endpoint->bEndpointAddress & USB_DIR_IN)) | 129 | if (!usb_endpoint_is_int_in(endpoint)) |
130 | return -ENODEV; | ||
131 | if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT) | ||
132 | return -ENODEV; | 130 | return -ENODEV; |
133 | 131 | ||
134 | pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); | 132 | pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); |
@@ -139,7 +137,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i | |||
139 | if (!mouse || !input_dev) | 137 | if (!mouse || !input_dev) |
140 | goto fail1; | 138 | goto fail1; |
141 | 139 | ||
142 | mouse->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &mouse->data_dma); | 140 | mouse->data = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &mouse->data_dma); |
143 | if (!mouse->data) | 141 | if (!mouse->data) |
144 | goto fail1; | 142 | goto fail1; |
145 | 143 | ||