diff options
Diffstat (limited to 'drivers/usb/input/usbkbd.c')
-rw-r--r-- | drivers/usb/input/usbkbd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c index 7038fb9d1ced..255b47a517b1 100644 --- a/drivers/usb/input/usbkbd.c +++ b/drivers/usb/input/usbkbd.c | |||
@@ -9,18 +9,18 @@ | |||
9 | /* | 9 | /* |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
12 | * the Free Software Foundation; either version 2 of the License, or | 12 | * the Free Software Foundation; either version 2 of the License, or |
13 | * (at your option) any later version. | 13 | * (at your option) any later version. |
14 | * | 14 | * |
15 | * This program is distributed in the hope that it will be useful, | 15 | * This program is distributed in the hope that it will be useful, |
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
18 | * GNU General Public License for more details. | 18 | * GNU General Public License for more details. |
19 | * | 19 | * |
20 | * You should have received a copy of the GNU General Public License | 20 | * You should have received a copy of the GNU General Public License |
21 | * along with this program; if not, write to the Free Software | 21 | * along with this program; if not, write to the Free Software |
22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
23 | * | 23 | * |
24 | * Should you need to contact me, the author, you can do so either by | 24 | * Should you need to contact me, the author, you can do so either by |
25 | * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail: | 25 | * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail: |
26 | * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic | 26 | * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic |
@@ -166,7 +166,7 @@ static void usb_kbd_led(struct urb *urb, struct pt_regs *regs) | |||
166 | 166 | ||
167 | if (urb->status) | 167 | if (urb->status) |
168 | warn("led urb status %d received", urb->status); | 168 | warn("led urb status %d received", urb->status); |
169 | 169 | ||
170 | if (*(kbd->leds) == kbd->newleds) | 170 | if (*(kbd->leds) == kbd->newleds) |
171 | return; | 171 | return; |
172 | 172 | ||
@@ -230,7 +230,7 @@ static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd) | |||
230 | usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma); | 230 | usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma); |
231 | } | 231 | } |
232 | 232 | ||
233 | static int usb_kbd_probe(struct usb_interface *iface, | 233 | static int usb_kbd_probe(struct usb_interface *iface, |
234 | const struct usb_device_id *id) | 234 | const struct usb_device_id *id) |
235 | { | 235 | { |
236 | struct usb_device * dev = interface_to_usbdev(iface); | 236 | struct usb_device * dev = interface_to_usbdev(iface); |
@@ -272,7 +272,7 @@ static int usb_kbd_probe(struct usb_interface *iface, | |||
272 | for (i = 0; i < 255; i++) | 272 | for (i = 0; i < 255; i++) |
273 | set_bit(usb_kbd_keycode[i], kbd->dev.keybit); | 273 | set_bit(usb_kbd_keycode[i], kbd->dev.keybit); |
274 | clear_bit(0, kbd->dev.keybit); | 274 | clear_bit(0, kbd->dev.keybit); |
275 | 275 | ||
276 | kbd->dev.private = kbd; | 276 | kbd->dev.private = kbd; |
277 | kbd->dev.event = usb_kbd_event; | 277 | kbd->dev.event = usb_kbd_event; |
278 | kbd->dev.open = usb_kbd_open; | 278 | kbd->dev.open = usb_kbd_open; |
@@ -294,7 +294,7 @@ static int usb_kbd_probe(struct usb_interface *iface, | |||
294 | sprintf(kbd->phys, "%s/input0", path); | 294 | sprintf(kbd->phys, "%s/input0", path); |
295 | 295 | ||
296 | kbd->dev.name = kbd->name; | 296 | kbd->dev.name = kbd->name; |
297 | kbd->dev.phys = kbd->phys; | 297 | kbd->dev.phys = kbd->phys; |
298 | kbd->dev.id.bustype = BUS_USB; | 298 | kbd->dev.id.bustype = BUS_USB; |
299 | kbd->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); | 299 | kbd->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); |
300 | kbd->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); | 300 | kbd->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); |
@@ -329,7 +329,7 @@ static int usb_kbd_probe(struct usb_interface *iface, | |||
329 | static void usb_kbd_disconnect(struct usb_interface *intf) | 329 | static void usb_kbd_disconnect(struct usb_interface *intf) |
330 | { | 330 | { |
331 | struct usb_kbd *kbd = usb_get_intfdata (intf); | 331 | struct usb_kbd *kbd = usb_get_intfdata (intf); |
332 | 332 | ||
333 | usb_set_intfdata(intf, NULL); | 333 | usb_set_intfdata(intf, NULL); |
334 | if (kbd) { | 334 | if (kbd) { |
335 | usb_kill_urb(kbd->irq); | 335 | usb_kill_urb(kbd->irq); |