Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 12 Aug 2018 06:55:01 +0000 (08:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 12 Aug 2018 06:55:10 +0000 (08:55 +0200)
Preparation for 4.19 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/dice/dice-alesis.c
sound/pci/hda/hda_intel.c

index b2efb1c71a98dd8bc49fb00a7a79500fcc84222b..218292bdace6fd63bbc5e94060cd20d69146cdca 100644 (file)
@@ -37,7 +37,7 @@ int snd_dice_detect_alesis_formats(struct snd_dice *dice)
                                MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *
                                sizeof(unsigned int));
        } else {
-               memcpy(dice->rx_pcm_chs, alesis_io26_tx_pcm_chs,
+               memcpy(dice->tx_pcm_chs, alesis_io26_tx_pcm_chs,
                                MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *
                                sizeof(unsigned int));
        }
index 19198312e14297537ff48a9219407fe25c189160..1b2ce304152a65c52ce60322dbeec684965cf335 100644 (file)
@@ -2208,7 +2208,7 @@ out_free:
  */
 static struct snd_pci_quirk power_save_blacklist[] = {
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
-       SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0),
+       SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0),
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
        SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0),
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */