diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-29 02:29:38 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-29 02:29:38 -0500 |
| commit | 65cde54b8b0299d7e46b8705338b01d1e44a5eb0 (patch) | |
| tree | 2aa4c3ab303fd19440c636edaecdb0976f9d82c7 /drivers/usb/input/usbkbd.c | |
| parent | 3108d42de4da0823feb37a55db62acdc01554625 (diff) | |
| download | kernel-crypto-65cde54b8b0299d7e46b8705338b01d1e44a5eb0.tar.gz kernel-crypto-65cde54b8b0299d7e46b8705338b01d1e44a5eb0.tar.xz kernel-crypto-65cde54b8b0299d7e46b8705338b01d1e44a5eb0.zip | |
Input: remove user counters from drivers/usb/input since input
core takes care of calling open and close methods only
when needed.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/usb/input/usbkbd.c')
| -rw-r--r-- | drivers/usb/input/usbkbd.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c index 255b47a517b..f35db1974c4 100644 --- a/drivers/usb/input/usbkbd.c +++ b/drivers/usb/input/usbkbd.c @@ -72,7 +72,6 @@ struct usb_kbd { unsigned char newleds; char name[128]; char phys[64]; - int open; unsigned char *new; struct usb_ctrlrequest *cr; @@ -180,14 +179,9 @@ static int usb_kbd_open(struct input_dev *dev) { struct usb_kbd *kbd = dev->private; - if (kbd->open++) - return 0; - kbd->irq->dev = kbd->usbdev; - if (usb_submit_urb(kbd->irq, GFP_KERNEL)) { - kbd->open--; + if (usb_submit_urb(kbd->irq, GFP_KERNEL)) return -EIO; - } return 0; } @@ -196,8 +190,7 @@ static void usb_kbd_close(struct input_dev *dev) { struct usb_kbd *kbd = dev->private; - if (!--kbd->open) - usb_kill_urb(kbd->irq); + usb_kill_urb(kbd->irq); } static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) |