1 files changed, 50 insertions, 43 deletions

diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
index 4104dec847fb..230f6b1b314a 100644
--- a/drivers/usb/input/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
@@ -50,7 +50,7 @@ struct usb_mouse {
         char name[128];
         char phys[64];
         struct usb_device *usbdev;
-        struct input_dev dev;
+        struct input_dev *dev;
         struct urb *irq;
 
         signed char *data;
@@ -61,7 +61,7 @@ static void usb_mouse_irq(struct urb *urb, struct pt_regs *regs)
 {
         struct usb_mouse *mouse = urb->context;
         signed char *data = mouse->data;
-        struct input_dev *dev = &mouse->dev;
+        struct input_dev *dev = mouse->dev;
         int status;
 
         switch (urb->status) {
@@ -115,14 +115,14 @@ static void usb_mouse_close(struct input_dev *dev)
         usb_kill_urb(mouse->irq);
 }
 
-static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_id * id)
+static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
-        struct usb_device * dev = interface_to_usbdev(intf);
+        struct usb_device *dev = interface_to_usbdev(intf);
         struct usb_host_interface *interface;
         struct usb_endpoint_descriptor *endpoint;
         struct usb_mouse *mouse;
+        struct input_dev *input_dev;
         int pipe, maxp;
-        char path[64];
 
         interface = intf->cur_altsetting;
 
@@ -130,59 +130,62 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_
                 return -ENODEV;
 
         endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & 0x80))
+        if (!(endpoint->bEndpointAddress & USB_DIR_IN))
                 return -ENODEV;
-        if ((endpoint->bmAttributes & 3) != 3)
+        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
                 return -ENODEV;
 
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
-        if (!(mouse = kmalloc(sizeof(struct usb_mouse), GFP_KERNEL)))
-                return -ENOMEM;
-        memset(mouse, 0, sizeof(struct usb_mouse));
+        mouse = kzalloc(sizeof(struct usb_mouse), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!mouse || !input_dev)
+                goto fail1;
 
         mouse->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &mouse->data_dma);
-        if (!mouse->data) {
-                kfree(mouse);
-                return -ENOMEM;
-        }
+        if (!mouse->data)
+                goto fail1;
 
         mouse->irq = usb_alloc_urb(0, GFP_KERNEL);
-        if (!mouse->irq) {
-                usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
-                kfree(mouse);
-                return -ENODEV;
-        }
+        if (!mouse->irq)
+                goto fail2;
 
         mouse->usbdev = dev;
+        mouse->dev = input_dev;
+
+        if (dev->manufacturer)
+                strlcpy(mouse->name, dev->manufacturer, sizeof(mouse->name));
 
-        mouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        mouse->dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        mouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        mouse->dev.keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-        mouse->dev.relbit[0] |= BIT(REL_WHEEL);
+        if (dev->product) {
+                if (dev->manufacturer)
+                        strlcat(mouse->name, " ", sizeof(mouse->name));
+                strlcat(mouse->name, dev->product, sizeof(mouse->name));
+        }
 
-        mouse->dev.private = mouse;
-        mouse->dev.open = usb_mouse_open;
-        mouse->dev.close = usb_mouse_close;
+        if (!strlen(mouse->name))
+                snprintf(mouse->name, sizeof(mouse->name),
+                         "USB HIDBP Mouse %04x:%04x",
+                         le16_to_cpu(dev->descriptor.idVendor),
+                         le16_to_cpu(dev->descriptor.idProduct));
 
-        usb_make_path(dev, path, 64);
-        sprintf(mouse->phys, "%s/input0", path);
+        usb_make_path(dev, mouse->phys, sizeof(mouse->phys));
+        strlcat(mouse->phys, "/input0", sizeof(mouse->phys));
 
-        mouse->dev.name = mouse->name;
-        mouse->dev.phys = mouse->phys;
-        usb_to_input_id(dev, &mouse->dev.id);
-        mouse->dev.dev = &intf->dev;
+        input_dev->name = mouse->name;
+        input_dev->phys = mouse->phys;
+        usb_to_input_id(dev, &input_dev->id);
+        input_dev->cdev.dev = &intf->dev;
 
-        if (dev->manufacturer)
-                strcat(mouse->name, dev->manufacturer);
-        if (dev->product)
-                sprintf(mouse->name, "%s %s", mouse->name, dev->product);
+        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
+        input_dev->relbit[0] |= BIT(REL_WHEEL);
 
-        if (!strlen(mouse->name))
-                sprintf(mouse->name, "USB HIDBP Mouse %04x:%04x",
-                        mouse->dev.id.vendor, mouse->dev.id.product);
+        input_dev->private = mouse;
+        input_dev->open = usb_mouse_open;
+        input_dev->close = usb_mouse_close;
 
         usb_fill_int_urb(mouse->irq, dev, pipe, mouse->data,
                          (maxp > 8 ? 8 : maxp),
@@ -190,11 +193,15 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_
         mouse->irq->transfer_dma = mouse->data_dma;
         mouse->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        input_register_device(&mouse->dev);
-        printk(KERN_INFO "input: %s on %s\n", mouse->name, path);
+        input_register_device(mouse->dev);
 
         usb_set_intfdata(intf, mouse);
         return 0;
+
+fail2:  usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
+fail1:  input_free_device(input_dev);
+        kfree(mouse);
+        return -ENOMEM;
 }
 
 static void usb_mouse_disconnect(struct usb_interface *intf)
@@ -204,7 +211,7 @@ static void usb_mouse_disconnect(struct usb_interface *intf)
         usb_set_intfdata(intf, NULL);
         if (mouse) {
                 usb_kill_urb(mouse->irq);
-                input_unregister_device(&mouse->dev);
+                input_unregister_device(mouse->dev);
                 usb_free_urb(mouse->irq);
                 usb_buffer_free(interface_to_usbdev(intf), 8, mouse->data, mouse->data_dma);
                 kfree(mouse);