redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix possible deadlock in hidraw_read
  HID: fix kerneldoc comment for hid_input_report()
  HID: add __init/__exit macros to twinhan.c
wifi-calibration
Linus Torvalds 2009-10-13 10:10:33 -07:00
parent ae445b9134 b0e14951ee
commit 03266d28ca
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/hid-core.c
View File

@ -1066,7 +1066,7 @@ EXPORT_SYMBOL_GPL(hid_report_raw_event);
* @type: HID report type (HID_*_REPORT) * @type: HID report type (HID_*_REPORT)
* @data: report contents * @data: report contents
* @size: size of data parameter * @size: size of data parameter
* @interrupt: called from atomic? * @interrupt: distinguish between interrupt and control transfers
* *
* This is data entry for lower layers. * This is data entry for lower layers.
*/ */

4
drivers/hid/hid-twinhan.c
View File

@ -132,12 +132,12 @@ static struct hid_driver twinhan_driver = {
.input_mapping = twinhan_input_mapping, .input_mapping = twinhan_input_mapping,
}; };
static int twinhan_init(void) static int __init twinhan_init(void)
{ {
return hid_register_driver(&twinhan_driver); return hid_register_driver(&twinhan_driver);
} }
static void twinhan_exit(void) static void __exit twinhan_exit(void)
{ {
hid_unregister_driver(&twinhan_driver); hid_unregister_driver(&twinhan_driver);
} }

5
drivers/hid/hidraw.c
View File

@ -48,10 +48,9 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
char *report; char *report;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
mutex_lock(&list->read_mutex);
while (ret == 0) { while (ret == 0) {
mutex_lock(&list->read_mutex);
if (list->head == list->tail) { if (list->head == list->tail) {
add_wait_queue(&list->hidraw->wait, &wait); add_wait_queue(&list->hidraw->wait, &wait);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);