[5.13,172/300] ASoC: Intel: Fix platform ID matching

Message ID	20210913131115.213682866@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Curtis Malainey <cujomalainey@chromium.org>, Matt Davis <mattedavis@google.com>, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.13 172/300] ASoC: Intel: Fix platform ID matching Date: Mon, 13 Sep 2021 15:13:53 +0200 Message-Id: <20210913131115.213682866@linuxfoundation.org> In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.13,002/300] regmap: fix the offset of register error log [5.13,005/300] sched/deadline: Fix reset_on_fork reporting of DL tasks [5.13,007/300] crypto: omap-sham - clear dma flags only after omap_sham_update_dma_stop() [5.13,009/300] rcu/tree: Handle VM stoppage in stall detection [5.13,011/300] posix-cpu-timers: Force next expiration recalc after itimer reset [5.13,012/300] hrtimer: Avoid double reprogramming in __hrtimer_start_range_ns() [5.13,014/300] udf: Check LVID earlier [5.13,016/300] isofs: joliet: Fix iocharset=utf8 mount option [5.13,021/300] nvme-rdma: dont update queue count when failing to set io queues [5.13,022/300] nvmet: pass back cntlid on successful completion [5.13,024/300] power: supply: max17042_battery: fix typo in MAx17042_TOFF [5.13,027/300] libata: fix ata_host_start() [5.13,028/300] sched/topology: Skip updating masks for non-online nodes [5.13,030/300] crypto: qat - do not ignore errors from enable_vf2pf_comms() [5.13,031/300] crypto: qat - handle both source of interrupt in VF ISR [5.13,032/300] crypto: qat - fix reuse of completion variable [5.13,033/300] crypto: qat - fix naming for init/shutdown VF to PF notifications [5.13,037/300] crypto: tcrypt - Fix missing return value check [5.13,040/300] udf_get_extendedattr() had no boundary checks. [5.13,045/300] s390/debug: fix debug area life cycle [5.13,046/300] s390/ap: fix state machine hang after failure to enable irq [5.13,047/300] sched/debug: Dont update sched_domain debug directories before sched_debug_init() [5.13,048/300] power: supply: cw2015: use dev_err_probe to allow deferred probe [5.13,050/300] crypto: x86/aes-ni - add missing error checks in XTS code [5.13,052/300] sched/numa: Fix is_core_idle() [5.13,054/300] rcu: Fix to include first blocked task in stall warning [5.13,059/300] spi: spi-pic32: Fix issue with uninitialized dma_slave_config [5.13,060/300] genirq/timings: Fix error return code in irq_timings_test_irqs() [5.13,061/300] irqchip/loongson-pch-pic: Improve edge triggered interrupt support [5.13,064/300] block: nbd: add sanity check for first_minor [5.13,066/300] irqchip/apple-aic: Fix irq_disable from within irq handlers [5.13,067/300] irqchip/gic-v3: Fix priority comparison when non-secure priorities are used [5.13,069/300] certs: Trigger creation of RSA module signing key if its not an RSA key [5.13,071/300] io_uring: refactor io_submit_flush_completions() [5.13,073/300] spi: davinci: invoke chipselect callback [5.13,074/300] blk-crypto: fix check for too-large dun_bytes [5.13,076/300] regulator: vctrl: Avoid lockdep warning in enable/disable ops [5.13,078/300] spi: spi-zynq-qspi: use wait_for_completion_timeout to make zynq_qspi_exec_mem_op ... [5.13,080/300] EDAC/i10nm: Fix NVDIMM detection [5.13,081/300] drm/panfrost: Fix missing clk_disable_unprepare() on error in panfrost_clk_init() [5.13,082/300] drm/gma500: Fix end of loop tests for list_for_each_entry [5.13,086/300] leds: is31fl32xx: Fix missing error code in is31fl32xx_parse_dt() [5.13,087/300] soc: rockchip: ROCKCHIP_GRF should not default to y, unconditionally [5.13,089/300] drm/of: free the right object [5.13,091/300] bpf: Fix potential memleak and UAF in the verifier. [5.13,095/300] ARM: dts: aspeed-g6: Fix HVI3C function-group in pinctrl dtsi [5.13,096/300] arm64: dts: renesas: r8a77995: draak: Remove bogus adv7511w properties [5.13,097/300] i40e: improve locking of mac_filter_hash [5.13,099/300] soc: qcom: rpmhpd: Use corner in power_off [5.13,102/300] arm64: dts: qcom: sm8250: fix usb2 qmp phy node [5.13,104/300] firmware: fix theoretical UAF race with firmware cache and resume [5.13,105/300] driver core: Fix error return code in really_probe() [5.13,107/300] media: dvb-usb: fix uninit-value in dvb_usb_adapter_dvb_init [5.13,109/300] media: dvb-usb: Fix error handling in dvb_usb_i2c_init [5.13,111/300] media: go7007: remove redundant initialization [5.13,113/300] media: rockchip/rga: fix error handling in probe [5.13,117/300] Bluetooth: btusb: Fix a unspported condition to set available debug features [5.13,118/300] 6lowpan: iphc: Fix an off-by-one check of array index [5.13,120/300] tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos [5.13,121/300] ARM: dts: meson8: Use a higher default GPU clock frequency [5.13,123/300] ARM: dts: meson8b: mxq: Fix the pwm regulator supply properties [5.13,124/300] ARM: dts: meson8b: ec100: Fix the pwm regulator supply properties [5.13,126/300] net/mlx5e: Block LRO if firmware asks for tunneled LRO [5.13,127/300] cgroup/cpuset: Fix a partition bug with hotplug [5.13,128/300] drm: mxsfb: Enable recovery on underflow [5.13,129/300] drm: mxsfb: Increase number of outstanding requests on V4 and newer HW [5.13,130/300] drm: mxsfb: Clear FIFO_CLEAR bit [5.13,131/300] net: cipso: fix warnings in netlbl_cipsov4_add_std [5.13,133/300] drm: rcar-du: Dont put reference to drm_device in rcar_du_remove() [5.13,135/300] tools: Free BTF objects at various locations [5.13,136/300] arm64: dts: renesas: hihope-rzg2-ex: Add EtherAVB internal rx delay [5.13,138/300] net/mlx5: Fix missing return value in mlx5_devlink_eswitch_inline_mode_set() [5.13,141/300] leds: lgm-sso: Dont spam logs when probe is deferred [5.13,143/300] leds: rt8515: Put fwnode in any case during ->probe() [5.13,144/300] leds: trigger: audio: Add an activate callback to ensure the initial brightness is... [5.13,146/300] media: omap3isp: Fix missing unlock in isp_subdev_notifier_complete() [5.13,147/300] media: venus: hfi: fix return value check in sys_get_prop_image_version() [5.13,149/300] media: venus: helper: do not set constrained parameters for UBWC [5.13,150/300] soc: mmsys: mediatek: add mask to mmsys routes [5.13,156/300] Bluetooth: increase BTNAMSIZ to 21 chars to fix potential buffer overflow [5.13,158/300] net: dsa: stop syncing the bridge mcast_router attribute at join time [5.13,160/300] net: dsa: dont disable multicast flooding to the CPU even without an IGMP querier [5.13,162/300] selftests/bpf: Fix bpf-iter-tcp4 test to print correctly the dest IP [5.13,164/300] drm/msm/mdp4: refactor HW revision detection into read_mdp_hw_revision [5.13,165/300] drm/msm/mdp4: move HW revision detection to earlier phase [5.13,167/300] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs [5.13,172/300] ASoC: Intel: Fix platform ID matching [5.13,173/300] Bluetooth: fix repeated calls to sco_sock_kill [5.13,174/300] drm/msm/dsi: Fix some reference counted resource leaks [5.13,182/300] usb: gadget: udc: s3c2410: add IRQ check [5.13,183/300] usb: misc: brcmstb-usb-pinmap: add IRQ check [5.13,185/300] usb: phy: twl6030: add IRQ checks [5.13,186/300] usb: gadget: udc: renesas_usb3: Fix soc_device_match() abuse [5.13,189/300] samples: pktgen: add missing IPv6 option to pktgen scripts [5.13,190/300] net: stmmac: fix INTR TBU status affecting irq count statistic [5.13,192/300] PM: cpu: Make notifier chain use a raw_spinlock_t [5.13,194/300] usb: phy: tahvo: add IRQ check [5.13,195/300] libbpf: Re-build libbpf.so when libbpf.map changes [5.13,198/300] lockd: Fix invalid lockowner cast after vfs_test_lock [5.13,201/300] arm64: dts: marvell: armada-37xx: Extend PCIe MEM space [5.13,202/300] clk: staging: correct reference to config IOMEM to config HAS_IOMEM [5.13,204/300] hwmon: (pmbus/bpa-rs600) Dont use rated limits as warn limits [5.13,205/300] hwmon: remove amd_energy driver in Makefile [5.13,206/300] ASoC: fsl_rpmsg: Check -EPROBE_DEFER for getting clocks [5.13,208/300] usb: gadget: mv_u3d: request_irq() after initializing UDC [5.13,209/300] mm/swap: consider max pages in iomap_swapfile_add_extent [5.13,211/300] Bluetooth: add timeout sanity check to hci_inquiry [5.13,214/300] i2c: hix5hd2: fix IRQ check [5.13,216/300] rsi: fix error code in rsi_load_9116_firmware() [5.13,218/300] octeontx2-af: cn10k: Fix SDP base channel number [5.13,219/300] octeontx2-pf: send correct vlan priority mask to npc_install_flow_req [5.13,222/300] m68k: coldfire: return success for clk_enable(NULL) [5.13,223/300] ASoC: Intel: kbl_da7219_max98927: Fix format selection for max98373 [5.13,225/300] ASoC: Intel: Skylake: Fix module resource and format selection [5.13,227/300] mmc: dw_mmc: Fix issue with uninitialized dma_slave_config [5.13,231/300] i2c: mt65xx: fix IRQ check [5.13,232/300] i2c: xlp9xx: fix main IRQ check [5.13,234/300] usb: ehci-orion: Handle errors of clk_prepare_enable() in probe [5.13,236/300] usb: bdc: Fix a resource leak in the error handling path of bdc_probe() [5.13,237/300] tty: serial: fsl_lpuart: fix the wrong mapbase value [5.13,238/300] ASoC: wcd9335: Fix a double irq free in the remove function [5.13,239/300] ASoC: wcd9335: Fix a memory leak in the error handling path of the probe function [5.13,240/300] ASoC: wcd9335: Disable irq on slave ports in the remove function [5.13,242/300] net/mlx5: Remove all auxiliary devices at the unregister event [5.13,243/300] net/mlx5e: Fix possible use-after-free deleting fdb rule [5.13,247/300] net: phy: marvell10g: fix broken PHY interrupts for anyone after us in the driver ... [5.13,248/300] ath6kl: wmi: fix an error code in ath6kl_wmi_sync_point() [5.13,249/300] atlantic: Fix driver resume flow. [5.13,253/300] ipv4: make exception cache less predictible [5.13,256/300] net: sched: Fix qdisc_rate_table refcount leak when get tcf_block failed [5.13,258/300] octeontx2-af: Fix loop in free and unmap counter [5.13,259/300] octeontx2-af: Fix mailbox errors in nix_rss_flowkey_cfg [5.13,261/300] octeontx2-af: Set proper errorcode for IPv4 checksum errors [5.13,265/300] iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha [5.13,266/300] f2fs: guarantee to write dirty data when enabling checkpoint back [5.13,268/300] auxdisplay: hd44780: Fix oops on module unloading [5.13,270/300] io_uring: IORING_OP_WRITE needs hash_reg_file set [5.13,273/300] raid1: ensure write behind bio has less than BIO_MAX_VECS sectors [5.13,275/300] smb3: fix posix extensions mount option [5.13,276/300] tty: Fix data race between tiocsti() and flush_to_ldisc() [5.13,280/300] Revert "KVM: x86: mmu: Add guest physical address check in translate_gpa()" [5.13,281/300] KVM: s390: index kvm->arch.idle_mask by vcpu_idx [5.13,284/300] KVM: x86/mmu: Avoid collision with !PRESENT SPTEs in TDP MMU lpage stats [5.13,287/300] KVM: arm64: Unregister HYP sections from kmemleak in protected mode [5.13,288/300] ARM: dts: at91: add pinctrl-{names, 0} for all gpios [5.13,292/300] fuse: truncate pagecache on atomic_o_trunc [5.13,293/300] fuse: flush extending writes [5.13,294/300] fuse: wait for writepages in syncfs [5.13,296/300] IMA: remove the dependency on CRYPTO_MD5 [5.13,298/300] RDMA/mlx5: Fix number of allocated XLT entries [5.13,299/300] backlight: pwm_bl: Improve bootloader/kernel device handover [5.13,300/300] clk: kirkwood: Fix a clocking boot regression

Message ID

20210913131115.213682866@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Curtis Malainey <cujomalainey@chromium.org>,
	Matt Davis <mattedavis@google.com>,
	Cezary Rojewski <cezary.rojewski@intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.13 172/300] ASoC: Intel: Fix platform ID matching
Date: Mon, 13 Sep 2021 15:13:53 +0200
Message-Id: <20210913131115.213682866@linuxfoundation.org>
In-Reply-To: <20210913131109.253835823@linuxfoundation.org>
References: <20210913131109.253835823@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Sept. 13, 2021, 1:13 p.m. UTC

From: Curtis Malainey <cujomalainey@chromium.org>

[ Upstream commit f4eeaed04e861b95f1f2c911263f2fcaa959c078 ]

Sparse warnings triggered truncating the IDs of some platform device
tables. Unfortunately some of the IDs in the match tables were missed
which breaks audio. The KBL change has been verified to fix audio, the
CML change was not tested as it was found through grepping the broken
changes and found to match the same situation in anticipation that it
should also be fixed.

Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Tested-by: Matt Davis <mattedavis@google.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210809213544.1682444-1-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +-
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 7f6ef8229969..4d7a181fb8e6 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -75,7 +75,7 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "cml_da7219_max98357a",
+		.drv_name = "cml_da7219_mx98357a",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &max98390_spk_codecs,
 		.sof_fw_filename = "sof-cml.ri",
diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
index ba5ff468c265..741bf2f9e081 100644
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -87,7 +87,7 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "kbl_da7219_max98357a",
+		.drv_name = "kbl_da7219_mx98357a",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98357_codecs,

[5.13,172/300] ASoC: Intel: Fix platform ID matching

Commit Message

Patch