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

Commit fdb7ef01 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '276os-r-FP4_202206' into 'v1-r' 

FP4: Bump to FP4.FP40.A.142.20220628

See merge request !7
parents 4e00cf9d a297f9e3

drivers/hid/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -191,14 +191,14 @@ config HID_CHERRY 


config HID_CHICONY

	tristate "Chicony devices"

	depends on HID

	depends on USB_HID

	default !EXPERT

	---help---

	Support for Chicony Tactical pad and special keys on Chicony keyboards.



config HID_CORSAIR

	tristate "Corsair devices"

	depends on HID && USB && LEDS_CLASS

	depends on USB_HID && LEDS_CLASS

	---help---

	Support for Corsair devices that are not fully compliant with the

	HID standard.
@@ -219,7 +219,7 @@ config HID_COUGAR 


config HID_PRODIKEYS

	tristate "Prodikeys PC-MIDI Keyboard support"

	depends on HID && SND

	depends on USB_HID && SND

	select SND_RAWMIDI

	---help---

	Support for Prodikeys PC-MIDI Keyboard device support.
@@ -484,7 +484,7 @@ config HID_LENOVO 


config HID_LOGITECH

	tristate "Logitech devices"

	depends on HID

	depends on USB_HID

	default !EXPERT

	---help---

	Support for Logitech devices that are not fully compliant with HID standard.
@@ -833,7 +833,7 @@ config HID_SAITEK 


config HID_SAMSUNG

	tristate "Samsung InfraRed remote control or keyboards"

	depends on HID

	depends on USB_HID

	---help---

	Support for Samsung InfraRed remote control or keyboards.

drivers/hid/hid-asus.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (drvdata->quirks & QUIRK_IS_MULTITOUCH)

		drvdata->tp = &asus_i2c_tp;



	if (drvdata->quirks & QUIRK_T100_KEYBOARD) {

	if ((drvdata->quirks & QUIRK_T100_KEYBOARD) && hid_is_usb(hdev)) {

		struct usb_interface *intf = to_usb_interface(hdev->dev.parent);



		if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) {

drivers/hid/hid-chicony.c

+6 −2
Original line number Diff line number Diff line
@@ -61,8 +61,12 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static __u8 *ch_switch12_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

       struct usb_interface *intf;



       if (!hid_is_usb(hdev))

               return rdesc;



       intf = to_usb_interface(hdev->dev.parent);

	if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {

		/* Change usage maximum and logical maximum from 0x7fff to

		 * 0x2fff, so they don't exceed HID_MAX_USAGES */

drivers/hid/hid-corsair.c

+6 −1
Original line number Diff line number Diff line
@@ -556,7 +556,12 @@ static int corsair_probe(struct hid_device *dev, const struct hid_device_id *id) 
	int ret;

	unsigned long quirks = id->driver_data;

	struct corsair_drvdata *drvdata;

	struct usb_interface *usbif = to_usb_interface(dev->dev.parent);

       struct usb_interface *usbif;



       if (!hid_is_usb(dev))

               return -EINVAL;



       usbif = to_usb_interface(dev->dev.parent);



	drvdata = devm_kzalloc(&dev->dev, sizeof(struct corsair_drvdata),

			       GFP_KERNEL);

drivers/hid/hid-elan.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct elan_drvdata { 


static int is_not_elan_touchpad(struct hid_device *hdev)

{

	if (hdev->bus == BUS_USB) {

	if (hid_is_usb(hdev)) {

		struct usb_interface *intf = to_usb_interface(hdev->dev.parent);



		return (intf->altsetting->desc.bInterfaceNumber !=