projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic...
[cascardo/linux.git]
/
drivers
/
hid
/
hid-sony.c
diff --git
a/drivers/hid/hid-sony.c
b/drivers/hid/hid-sony.c
index
fa11930
..
27f67e7
100644
(file)
--- a/
drivers/hid/hid-sony.c
+++ b/
drivers/hid/hid-sony.c
@@
-805,7
+805,7
@@
union sixaxis_output_report_01 {
#define SIXAXIS_REPORT_0xF2_SIZE 17
#define SIXAXIS_REPORT_0xF5_SIZE 8
#define SIXAXIS_REPORT_0xF2_SIZE 17
#define SIXAXIS_REPORT_0xF5_SIZE 8
-static
spinlock_t sony_dev_list_lock
;
+static
DEFINE_SPINLOCK(sony_dev_list_lock)
;
static LIST_HEAD(sony_device_list);
static DEFINE_IDA(sony_device_id_allocator);
static LIST_HEAD(sony_device_list);
static DEFINE_IDA(sony_device_id_allocator);
@@
-1965,6
+1965,8
@@
static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
return -ENOMEM;
}
return -ENOMEM;
}
+ spin_lock_init(&sc->lock);
+
sc->quirks = quirks;
hid_set_drvdata(hdev, sc);
sc->hdev = hdev;
sc->quirks = quirks;
hid_set_drvdata(hdev, sc);
sc->hdev = hdev;
@@
-2168,8
+2170,8
@@
static void __exit sony_exit(void)
{
dbg_hid("Sony:%s\n", __func__);
{
dbg_hid("Sony:%s\n", __func__);
- ida_destroy(&sony_device_id_allocator);
hid_unregister_driver(&sony_driver);
hid_unregister_driver(&sony_driver);
+ ida_destroy(&sony_device_id_allocator);
}
module_init(sony_init);
module_exit(sony_exit);
}
module_init(sony_init);
module_exit(sony_exit);