diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-29 03:29:38 -0400 | 
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-05-29 03:29:38 -0400 | 
| commit | 65cde54b8b0299d7e46b8705338b01d1e44a5eb0 (patch) | |
| tree | 2aa4c3ab303fd19440c636edaecdb0976f9d82c7 /drivers/usb/input/kbtab.c | |
| parent | 3108d42de4da0823feb37a55db62acdc01554625 (diff) | |
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/kbtab.c')
| -rw-r--r-- | drivers/usb/input/kbtab.c | 11 | 
1 files changed, 2 insertions, 9 deletions
| diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c index fff5753b16ca..d2f0f90a9bcd 100644 --- a/drivers/usb/input/kbtab.c +++ b/drivers/usb/input/kbtab.c | |||
| @@ -36,7 +36,6 @@ struct kbtab { | |||
| 36 | struct input_dev dev; | 36 | struct input_dev dev; | 
| 37 | struct usb_device *usbdev; | 37 | struct usb_device *usbdev; | 
| 38 | struct urb *irq; | 38 | struct urb *irq; | 
| 39 | int open; | ||
| 40 | int x, y; | 39 | int x, y; | 
| 41 | int button; | 40 | int button; | 
| 42 | int pressure; | 41 | int pressure; | 
| @@ -105,14 +104,9 @@ static int kbtab_open(struct input_dev *dev) | |||
| 105 | { | 104 | { | 
| 106 | struct kbtab *kbtab = dev->private; | 105 | struct kbtab *kbtab = dev->private; | 
| 107 | 106 | ||
| 108 | if (kbtab->open++) | ||
| 109 | return 0; | ||
| 110 | |||
| 111 | kbtab->irq->dev = kbtab->usbdev; | 107 | kbtab->irq->dev = kbtab->usbdev; | 
| 112 | if (usb_submit_urb(kbtab->irq, GFP_KERNEL)) { | 108 | if (usb_submit_urb(kbtab->irq, GFP_KERNEL)) | 
| 113 | kbtab->open--; | ||
| 114 | return -EIO; | 109 | return -EIO; | 
| 115 | } | ||
| 116 | 110 | ||
| 117 | return 0; | 111 | return 0; | 
| 118 | } | 112 | } | 
| @@ -121,8 +115,7 @@ static void kbtab_close(struct input_dev *dev) | |||
| 121 | { | 115 | { | 
| 122 | struct kbtab *kbtab = dev->private; | 116 | struct kbtab *kbtab = dev->private; | 
| 123 | 117 | ||
| 124 | if (!--kbtab->open) | 118 | usb_kill_urb(kbtab->irq); | 
| 125 | usb_kill_urb(kbtab->irq); | ||
| 126 | } | 119 | } | 
| 127 | 120 | ||
| 128 | static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *id) | 121 | static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *id) | 
