Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (73bebc8b) · Commits · 戴 / test

Pull HID fixes from Jiri Kosina: "Fix for one particular device (bluetooth Tivo Slide) and change of 'default y' -> 'default n' for CONFIG_HID_BATTERY_STRENGTH which I overlooked in the initial merge of the battery support" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: default HID_BATTERY_STRENGTH to no HID: tivo: fix support for bluetooth version of tivo Slide

drivers/hid/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ config HID
		config HID_BATTERY_STRENGTH
		bool
		depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
		default y
		default n

		config HIDRAW
		bool "/dev/hidraw raw HID device support"

drivers/hid/hid-tivo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static int tivo_input_mapping(struct hid_device hdev, struct hid_input hi,

		static const struct hid_device_id tivo_devices[] = {
		/* TiVo Slide Bluetooth remote, pairs with a Broadcom dongle */
		{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },
		{ }
		};

Admin message