Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f755407d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - fix usage of sleeping lock in atomic context from Jiri Kosina

 - build fix for hid-steelseries under certain .config setups by Simon Wood

 - simple mismerge fix from Fernando Luis Vázquez Cao

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: debug: fix RCU preemption issue
  HID: hid-steelseries fix led class build issue
  HID: reintroduce fix-up for certain Sony RF receivers
parents 05a88a43 1deb9d34

drivers/hid/hid-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1685,6 +1685,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
@@ -2341,7 +2342,7 @@ struct hid_device *hid_allocate_device(void) 


	init_waitqueue_head(&hdev->debug_wait);

	INIT_LIST_HEAD(&hdev->debug_list);

	mutex_init(&hdev->debug_list_lock);

	spin_lock_init(&hdev->debug_list_lock);

	sema_init(&hdev->driver_lock, 1);

	sema_init(&hdev->driver_input_lock, 1);

drivers/hid/hid-debug.c

+9 −6
Original line number Diff line number Diff line
@@ -579,15 +579,16 @@ void hid_debug_event(struct hid_device *hdev, char *buf) 
{

	int i;

	struct hid_debug_list *list;

	unsigned long flags;



	mutex_lock(&hdev->debug_list_lock);

	spin_lock_irqsave(&hdev->debug_list_lock, flags);

	list_for_each_entry(list, &hdev->debug_list, node) {

		for (i = 0; i < strlen(buf); i++)

			list->hid_debug_buf[(list->tail + i) % HID_DEBUG_BUFSIZE] =

				buf[i];

		list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE;

        }

	mutex_unlock(&hdev->debug_list_lock);

	spin_unlock_irqrestore(&hdev->debug_list_lock, flags);



	wake_up_interruptible(&hdev->debug_wait);

}
@@ -977,6 +978,7 @@ static int hid_debug_events_open(struct inode *inode, struct file *file) 
{

	int err = 0;

	struct hid_debug_list *list;

	unsigned long flags;



	if (!(list = kzalloc(sizeof(struct hid_debug_list), GFP_KERNEL))) {

		err = -ENOMEM;
@@ -992,9 +994,9 @@ static int hid_debug_events_open(struct inode *inode, struct file *file) 
	file->private_data = list;

	mutex_init(&list->read_mutex);



	mutex_lock(&list->hdev->debug_list_lock);

	spin_lock_irqsave(&list->hdev->debug_list_lock, flags);

	list_add_tail(&list->node, &list->hdev->debug_list);

	mutex_unlock(&list->hdev->debug_list_lock);

	spin_unlock_irqrestore(&list->hdev->debug_list_lock, flags);



out:

	return err;
@@ -1088,10 +1090,11 @@ static unsigned int hid_debug_events_poll(struct file *file, poll_table *wait) 
static int hid_debug_events_release(struct inode *inode, struct file *file)

{

	struct hid_debug_list *list = file->private_data;

	unsigned long flags;



	mutex_lock(&list->hdev->debug_list_lock);

	spin_lock_irqsave(&list->hdev->debug_list_lock, flags);

	list_del(&list->node);

	mutex_unlock(&list->hdev->debug_list_lock);

	spin_unlock_irqrestore(&list->hdev->debug_list_lock, flags);

	kfree(list->hid_debug_buf);

	kfree(list);

drivers/hid/hid-steelseries.c

+6 −3
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include "hid-ids.h"



#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

#if IS_BUILTIN(CONFIG_LEDS_CLASS) || \

    (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES))

#define SRWS1_NUMBER_LEDS 15

struct steelseries_srws1_data {

	__u16 led_state;
@@ -107,7 +108,8 @@ static __u8 steelseries_srws1_rdesc_fixed[] = { 
0xC0                /*  End Collection                      */

};



#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

#if IS_BUILTIN(CONFIG_LEDS_CLASS) || \

    (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES))

static void steelseries_srws1_set_leds(struct hid_device *hdev, __u16 leds)

{

	struct list_head *report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
@@ -370,7 +372,8 @@ MODULE_DEVICE_TABLE(hid, steelseries_srws1_devices); 
static struct hid_driver steelseries_srws1_driver = {

	.name = "steelseries_srws1",

	.id_table = steelseries_srws1_devices,

#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

#if IS_BUILTIN(CONFIG_LEDS_CLASS) || \

    (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES))

	.probe = steelseries_srws1_probe,

	.remove = steelseries_srws1_remove,

#endif

include/linux/hid.h

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ struct hid_device { /* device report descriptor */ 
	struct dentry *debug_rdesc;

	struct dentry *debug_events;

	struct list_head debug_list;

	struct mutex debug_list_lock;

	spinlock_t  debug_list_lock;

	wait_queue_head_t debug_wait;

};