Merge branch 'for-linus' into for-next

Correct quirk table entries for Lenovo ThinkStation P620, too.
The name and profile strings are now set from a different table, hence
removed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/usb/quirks-table.h
index 7a80ef31bbe4ffa26d5ecad8ffcbb6ec88877975,416de71c6895d103b8dd78a2f2dafd51bf39c65c..969c79d0c688382c7f4ed905fd9f285802c2d452
--- 1/sound/usb/quirks-table.h
--- 2/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@@ -2707,6 -2817,36 +2707,23 @@@ YAMAHA_DEVICE(0x7010, "UB99")
        }
  },
  
 -/* */
 -{
 -      /* aka. Serato Scratch Live DJ Box */
 -      USB_DEVICE(0x13e5, 0x0001),
 -      QUIRK_RENAME_DEVICE("Rane", "SL-1")
 -},
 -
+ /* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */
+ {
+       USB_DEVICE(0x17aa, 0x1046),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
 -              .vendor_name = "Lenovo",
 -              .product_name = "ThinkStation P620 Rear",
 -              .profile_name = "Lenovo-ThinkStation-P620-Rear",
+               .ifnum = QUIRK_ANY_INTERFACE,
+               .type = QUIRK_SETUP_DISABLE_AUTOSUSPEND
+       }
+ },
+ /* Lenovo ThinkStation P620 Internal Speaker + Front Headset */
+ {
+       USB_DEVICE(0x17aa, 0x104d),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
 -              .vendor_name = "Lenovo",
 -              .product_name = "ThinkStation P620 Main",
 -              .profile_name = "Lenovo-ThinkStation-P620-Main",
+               .ifnum = QUIRK_ANY_INTERFACE,
+               .type = QUIRK_SETUP_DISABLE_AUTOSUSPEND
+       }
+ },
+ 
  /* Native Instruments MK2 series */
  {
        /* Komplete Audio 6 */

diff --cc sound/usb/usbaudio.h
Simple merge