You need to sign in or sign up before continuing.
提交 5054a467 编写于 作者: J Johan Hovold 提交者: Zheng Zengkai

USB: quirks: sort quirk entries

stable inclusion
from stable-5.10.19
commit f8921ed4d330cc9511381862c14af87a5b7f425e
bugzilla: 50607

--------------------------------

commit 43861d29 upstream.

Move the last entry to its proper place to maintain the VID/PID sort
order.

Cc: stable@vger.kernel.org
Signed-off-by: NJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210210111746.13360-1-johan@kernel.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 736829b9
...@@ -415,6 +415,9 @@ static const struct usb_device_id usb_quirk_list[] = { ...@@ -415,6 +415,9 @@ static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x10d6, 0x2200), .driver_info = { USB_DEVICE(0x10d6, 0x2200), .driver_info =
USB_QUIRK_STRING_FETCH_255 }, USB_QUIRK_STRING_FETCH_255 },
/* novation SoundControl XL */
{ USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },
/* Huawei 4G LTE module */ /* Huawei 4G LTE module */
{ USB_DEVICE(0x12d1, 0x15bb), .driver_info = { USB_DEVICE(0x12d1, 0x15bb), .driver_info =
USB_QUIRK_DISCONNECT_SUSPEND }, USB_QUIRK_DISCONNECT_SUSPEND },
...@@ -495,9 +498,6 @@ static const struct usb_device_id usb_quirk_list[] = { ...@@ -495,9 +498,6 @@ static const struct usb_device_id usb_quirk_list[] = {
/* INTEL VALUE SSD */ /* INTEL VALUE SSD */
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
/* novation SoundControl XL */
{ USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },
{ } /* terminating entry must be last */ { } /* terminating entry must be last */
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册