Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934065Ab3EAA0c (ORCPT ); Tue, 30 Apr 2013 20:26:32 -0400 Received: from tama500.ecl.ntt.co.jp ([129.60.39.148]:47915 "EHLO tama500.ecl.ntt.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933787Ab3EAA0b (ORCPT ); Tue, 30 Apr 2013 20:26:31 -0400 Message-ID: <1367367983.4712.5.camel@nexus> Subject: [PATCH] HID: fix botched tree merge that disabled fix-up for certain Sony RF receivers From: Fernando Luis =?ISO-8859-1?Q?V=E1zquez?= Cao To: Jiri Kosina Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Antonio Ospite Date: Wed, 01 May 2013 09:26:23 +0900 In-Reply-To: <1367367906.4712.4.camel@nexus> References: <1358221428.9926.1.camel@nexus.lab.ntt.co.jp> <20130115103638.be566e39f0f5ad7186362dd8@studenti.unina.it> <50F52986.2080002@lab.ntt.co.jp> <1358246448.4897.3.camel@nexus.lab.ntt.co.jp> <1367367906.4712.4.camel@nexus> Organization: NTT Open Source Software Center Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1602 Lines: 29 It looks like the manual merge 0d69a3c731e120b05b7da9fb976830475a3fbc01 ("Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus") accidentally removed Sony RF receiver with USB product id 0x0374 from the "have special driver" list, effectively nullifying a464918419f94a0043d2f549d6defb4c3f69f68a ("HID: add support for Sony RF receiver with USB product id 0x0374"). Add the device back to the list. Cc: stable@vger.kernel.org Signed-off-by: Fernando Luis Vazquez Cao --- diff -urNp linux-3.9/drivers/hid/hid-core.c linux-3.9-fix/drivers/hid/hid-core.c --- linux-3.9/drivers/hid/hid-core.c 2013-04-29 09:36:01.000000000 +0900 +++ linux-3.9-fix/drivers/hid/hid-core.c 2013-04-30 21:53:57.596269692 +0900 @@ -1702,6 +1702,7 @@ static const struct hid_device_id hid_ha { 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) }, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/