From: Sasha Levin Date: Mon, 1 May 2023 11:26:01 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v5.15.111~148 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07f7b4292aa58ba2d923bf216335a4900d73e0ae;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch b/queue-4.19/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch new file mode 100644 index 00000000000..f805437f7c7 --- /dev/null +++ b/queue-4.19/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch @@ -0,0 +1,50 @@ +From 1095c3dc93c515c9fbc31c32d3e55366127444c1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Mar 2023 15:53:32 +0100 +Subject: ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750 + +From: Hans de Goede + +[ Upstream commit e38c5e80c3d293a883c6f1d553f2146ec0bda35e ] + +The Acer Iconia One 7 B1-750 tablet mostly works fine with the defaults +for an Bay Trail CR tablet. Except for the internal mic, instead of +an analog mic on IN3 a digital mic on DMIC1 is uses. + +Add a quirk with these settings for this tablet. + +Acked-by: Pierre-Louis Bossart +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20230322145332.131525-1-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index 2001bc774c643..d27dd170bedaf 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -400,6 +400,18 @@ static int byt_rt5640_aif1_hw_params(struct snd_pcm_substream *substream, + + /* Please keep this list alphabetically sorted */ + static const struct dmi_system_id byt_rt5640_quirk_table[] = { ++ { /* Acer Iconia One 7 B1-750 */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Insyde"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "VESPA2"), ++ }, ++ .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | ++ BYT_RT5640_JD_SRC_JD1_IN4P | ++ BYT_RT5640_OVCD_TH_1500UA | ++ BYT_RT5640_OVCD_SF_0P75 | ++ BYT_RT5640_SSP0_AIF1 | ++ BYT_RT5640_MCLK_EN), ++ }, + { /* Acer Iconia Tab 8 W1-810 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"), +-- +2.39.2 + diff --git a/queue-4.19/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch b/queue-4.19/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch new file mode 100644 index 00000000000..658e9b99982 --- /dev/null +++ b/queue-4.19/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch @@ -0,0 +1,39 @@ +From a95c7c13e8ae3b22e7f651c1eaabc57f54410c98 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Mar 2023 21:50:29 +0100 +Subject: iio: adc: palmas_gpadc: fix NULL dereference on rmmod +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Patrik Dahlström + +[ Upstream commit 49f76c499d38bf67803438eee88c8300d0f6ce09 ] + +Calling dev_to_iio_dev() on a platform device pointer is undefined and +will make adc NULL. + +Signed-off-by: Patrik Dahlström +Link: https://lore.kernel.org/r/20230313205029.1881745-1-risca@dalakolonin.se +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/palmas_gpadc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c +index 7dcd4213d38a0..6b76622b4fbfa 100644 +--- a/drivers/iio/adc/palmas_gpadc.c ++++ b/drivers/iio/adc/palmas_gpadc.c +@@ -633,7 +633,7 @@ static int palmas_gpadc_probe(struct platform_device *pdev) + + static int palmas_gpadc_remove(struct platform_device *pdev) + { +- struct iio_dev *indio_dev = dev_to_iio_dev(&pdev->dev); ++ struct iio_dev *indio_dev = dev_get_drvdata(&pdev->dev); + struct palmas_gpadc *adc = iio_priv(indio_dev); + + if (adc->wakeup1_enable || adc->wakeup2_enable) +-- +2.39.2 + diff --git a/queue-4.19/series b/queue-4.19/series index 384a7d822f4..954c89604fa 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,3 +1,5 @@ wifi-brcmfmac-slab-out-of-bounds-read-in-brcmf_get_assoc_ies.patch bluetooth-perform-careful-capability-checks-in-hci_sock_ioctl.patch usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch +iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch +asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch