diff options
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index c40f0403edaf..497e0d1dd3c3 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -113,7 +113,7 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t | |||
113 | if (!dev->hid_output_raw_report) | 113 | if (!dev->hid_output_raw_report) |
114 | return -ENODEV; | 114 | return -ENODEV; |
115 | 115 | ||
116 | if (count > HID_MIN_BUFFER_SIZE) { | 116 | if (count > HID_MAX_BUFFER_SIZE) { |
117 | printk(KERN_WARNING "hidraw: pid %d passed too large report\n", | 117 | printk(KERN_WARNING "hidraw: pid %d passed too large report\n", |
118 | task_pid_nr(current)); | 118 | task_pid_nr(current)); |
119 | return -EINVAL; | 119 | return -EINVAL; |
@@ -181,7 +181,7 @@ static int hidraw_open(struct inode *inode, struct file *file) | |||
181 | 181 | ||
182 | dev = hidraw_table[minor]; | 182 | dev = hidraw_table[minor]; |
183 | if (!dev->open++) | 183 | if (!dev->open++) |
184 | dev->hid->hid_open(dev->hid); | 184 | dev->hid->ll_driver->open(dev->hid); |
185 | 185 | ||
186 | out_unlock: | 186 | out_unlock: |
187 | spin_unlock(&minors_lock); | 187 | spin_unlock(&minors_lock); |
@@ -207,7 +207,7 @@ static int hidraw_release(struct inode * inode, struct file * file) | |||
207 | dev = hidraw_table[minor]; | 207 | dev = hidraw_table[minor]; |
208 | if (!dev->open--) { | 208 | if (!dev->open--) { |
209 | if (list->hidraw->exist) | 209 | if (list->hidraw->exist) |
210 | dev->hid->hid_close(dev->hid); | 210 | dev->hid->ll_driver->close(dev->hid); |
211 | else | 211 | else |
212 | kfree(list->hidraw); | 212 | kfree(list->hidraw); |
213 | } | 213 | } |
@@ -367,7 +367,7 @@ void hidraw_disconnect(struct hid_device *hid) | |||
367 | device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); | 367 | device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); |
368 | 368 | ||
369 | if (hidraw->open) { | 369 | if (hidraw->open) { |
370 | hid->hid_close(hid); | 370 | hid->ll_driver->close(hid); |
371 | wake_up_interruptible(&hidraw->wait); | 371 | wake_up_interruptible(&hidraw->wait); |
372 | } else { | 372 | } else { |
373 | kfree(hidraw); | 373 | kfree(hidraw); |