Commit 64b4aef1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Things look calming down, as this contains only a few small fixes:

   - Fix for a corner-case bug with SG-buffer page allocation helper

   - A regression fix for Roland USB-audio device probe

   - A potential memory leak fix at the error path

   - Handful quirks and device-specific fixes for HD- and USB-audio"

* tag 'sound-6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda: fix potential memleak in 'add_widget_node'
  ALSA: memalloc: Don't fall back for SG-buffer with IOMMU
  ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue
  ALSA: hda/realtek: Add Positivo C6300 model quirk
  ALSA: usb-audio: Add DSD support for Accuphase DAC-60
  ALSA: usb-audio: Add quirk entry for M-Audio Micro
  ALSA: hda/hdmi - enable runtime pm for more AMD display audio
  ALSA: usb-audio: Remove redundant workaround for Roland quirk
  ALSA: usb-audio: Yet more regression for for the delayed card registration
  ALSA: hda/ca0132: add quirk for EVGA Z390 DARK
  ALSA: hda: clarify comments on SCF changes
  ALSA: arm: pxa: pxa2xx-ac97-lib: fix return value check of platform_get_irq()
  ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41
parents fd979ca6 9a5523f7

sound/arm/pxa2xx-ac97-lib.c

+3 −1
Original line number Diff line number Diff line
@@ -402,8 +402,10 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev) 
		goto err_clk2;



	irq = platform_get_irq(dev, 0);

	if (!irq)

	if (irq < 0) {

		ret = irq;

		goto err_irq;

	}



	ret = request_irq(irq, pxa2xx_ac97_irq, 0, "AC97", NULL);

	if (ret < 0)

sound/core/memalloc.c

+11 −9
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/dma-mapping.h>

#include <linux/dma-map-ops.h>

#include <linux/genalloc.h>

#include <linux/highmem.h>

#include <linux/vmalloc.h>
@@ -541,19 +542,20 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) 
	struct sg_table *sgt;

	void *p;



	sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,

				      DEFAULT_GFP, 0);

	if (!sgt) {

#ifdef CONFIG_SND_DMA_SGBUF

	if (!get_dma_ops(dmab->dev.dev)) {

		if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG)

			dmab->dev.type = SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;

		else

			dmab->dev.type = SNDRV_DMA_TYPE_DEV_SG_FALLBACK;

		return snd_dma_sg_fallback_alloc(dmab, size);

#else

		return NULL;

#endif

	}

#endif



	sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,

				      DEFAULT_GFP, 0);

	if (!sgt)

		return NULL;



	dmab->dev.need_sync = dma_need_sync(dmab->dev.dev,

					    sg_dma_address(sgt->sgl));
@@ -857,7 +859,7 @@ static const struct snd_malloc_ops snd_dma_noncoherent_ops = { 
/*

 * Entry points

 */

static const struct snd_malloc_ops *dma_ops[] = {

static const struct snd_malloc_ops *snd_dma_ops[] = {

	[SNDRV_DMA_TYPE_CONTINUOUS] = &snd_dma_continuous_ops,

	[SNDRV_DMA_TYPE_VMALLOC] = &snd_dma_vmalloc_ops,

#ifdef CONFIG_HAS_DMA
@@ -883,7 +885,7 @@ static const struct snd_malloc_ops *snd_dma_get_ops(struct snd_dma_buffer *dmab) 
	if (WARN_ON_ONCE(!dmab))

		return NULL;

	if (WARN_ON_ONCE(dmab->dev.type <= SNDRV_DMA_TYPE_UNKNOWN ||

			 dmab->dev.type >= ARRAY_SIZE(dma_ops)))

			 dmab->dev.type >= ARRAY_SIZE(snd_dma_ops)))

		return NULL;

	return dma_ops[dmab->dev.type];

	return snd_dma_ops[dmab->dev.type];

}

sound/hda/hdac_sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -346,8 +346,10 @@ static int add_widget_node(struct kobject *parent, hda_nid_t nid, 
		return -ENOMEM;

	kobject_init(kobj, &widget_ktype);

	err = kobject_add(kobj, parent, "%02x", nid);

	if (err < 0)

	if (err < 0) {

		kobject_put(kobj);

		return err;

	}

	err = sysfs_create_group(kobj, group);

	if (err < 0) {

		kobject_put(kobj);

sound/pci/hda/hda_intel.c

+7 −4
Original line number Diff line number Diff line
@@ -485,8 +485,8 @@ static int intel_ml_lctl_set_power(struct azx *chip, int state) 
	int timeout;



	/*

	 * the codecs are sharing the first link setting by default

	 * If other links are enabled for stream, they need similar fix

	 * Changes to LCTL.SCF are only needed for the first multi-link dealing

	 * with external codecs

	 */

	val = readl(bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);

	val &= ~AZX_ML_LCTL_SPA;
@@ -513,7 +513,7 @@ static void intel_init_lctl(struct azx *chip) 


	/* 0. check lctl register value is correct or not */

	val = readl(bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);

	/* if SCF is already set, let's use it */

	/* only perform additional configurations if the SCF is initially based on 6MHz */

	if ((val & AZX_ML_LCTL_SCF) != 0)

		return;
@@ -531,7 +531,7 @@ static void intel_init_lctl(struct azx *chip) 
	if (ret)

		goto set_spa;



	/* 2. update SCF to select a properly audio clock*/

	/* 2. update SCF to select an audio clock different from 6MHz */

	val &= ~AZX_ML_LCTL_SCF;

	val |= intel_get_lctl_scf(chip);

	writel(val, bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);
@@ -2711,6 +2711,9 @@ static const struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x1002, 0xab28),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |

	  AZX_DCAPS_PM_RUNTIME },

	{ PCI_DEVICE(0x1002, 0xab30),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |

	  AZX_DCAPS_PM_RUNTIME },

	{ PCI_DEVICE(0x1002, 0xab38),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |

	  AZX_DCAPS_PM_RUNTIME },

sound/pci/hda/patch_ca0132.c

+1 −0
Original line number Diff line number Diff line
@@ -1306,6 +1306,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { 
	SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),

	SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),

	SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),

	SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI),

	SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),

	SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),

	SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5),