From 93d0184df06fd98c148f7e1dd7da7b789ba7ab88 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 28 Dec 2023 11:20:26 +0000 Subject: [PATCH] drop iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch from 4.14 and 4.19 --- ...urn-value-check-of-tiadc_request_dma.patch | 40 ------------------- queue-4.14/series | 1 - ...urn-value-check-of-tiadc_request_dma.patch | 40 ------------------- queue-4.19/series | 1 - 4 files changed, 82 deletions(-) delete mode 100644 queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch delete mode 100644 queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch diff --git a/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch b/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch deleted file mode 100644 index 33ba0cc1d5f..00000000000 --- a/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 60576e84c187043cef11f11d015249e71151d35a Mon Sep 17 00:00:00 2001 -From: Wadim Egorov -Date: Mon, 25 Sep 2023 15:44:27 +0200 -Subject: iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() - -From: Wadim Egorov - -commit 60576e84c187043cef11f11d015249e71151d35a upstream. - -Fix wrong handling of a DMA request where the probing only failed -if -EPROPE_DEFER was returned. Instead, let us fail if a non -ENODEV -value is returned. This makes DMAs explicitly optional. Even if the -DMA request is unsuccessfully, the ADC can still work properly. -We do also handle the defer probe case by making use of dev_err_probe(). - -Fixes: f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support") -Signed-off-by: Wadim Egorov -Reviewed-by: Bhavya Kapoor -Link: https://lore.kernel.org/r/20230925134427.214556-1-w.egorov@phytec.de -Cc: -Signed-off-by: Jonathan Cameron -Signed-off-by: Greg Kroah-Hartman ---- - drivers/iio/adc/ti_am335x_adc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/iio/adc/ti_am335x_adc.c -+++ b/drivers/iio/adc/ti_am335x_adc.c -@@ -654,8 +654,10 @@ static int tiadc_probe(struct platform_d - platform_set_drvdata(pdev, indio_dev); - - err = tiadc_request_dma(pdev, adc_dev); -- if (err && err == -EPROBE_DEFER) -+ if (err && err != -ENODEV) { -+ dev_err_probe(&pdev->dev, err, "DMA request failed\n"); - goto err_dma; -+ } - - return 0; - diff --git a/queue-4.14/series b/queue-4.14/series index 848cdaa3760..ffb8ffa629c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -8,7 +8,6 @@ pinctrl-at91-pio4-use-dedicated-lock-class-for-irq.patch iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch input-ipaq-micro-keys-add-error-handling-for-devm_km.patch iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch -iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch wifi-cfg80211-add-my-certificate.patch wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch diff --git a/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch b/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch deleted file mode 100644 index 95aa919b987..00000000000 --- a/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 60576e84c187043cef11f11d015249e71151d35a Mon Sep 17 00:00:00 2001 -From: Wadim Egorov -Date: Mon, 25 Sep 2023 15:44:27 +0200 -Subject: iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() - -From: Wadim Egorov - -commit 60576e84c187043cef11f11d015249e71151d35a upstream. - -Fix wrong handling of a DMA request where the probing only failed -if -EPROPE_DEFER was returned. Instead, let us fail if a non -ENODEV -value is returned. This makes DMAs explicitly optional. Even if the -DMA request is unsuccessfully, the ADC can still work properly. -We do also handle the defer probe case by making use of dev_err_probe(). - -Fixes: f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support") -Signed-off-by: Wadim Egorov -Reviewed-by: Bhavya Kapoor -Link: https://lore.kernel.org/r/20230925134427.214556-1-w.egorov@phytec.de -Cc: -Signed-off-by: Jonathan Cameron -Signed-off-by: Greg Kroah-Hartman ---- - drivers/iio/adc/ti_am335x_adc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/iio/adc/ti_am335x_adc.c -+++ b/drivers/iio/adc/ti_am335x_adc.c -@@ -653,8 +653,10 @@ static int tiadc_probe(struct platform_d - platform_set_drvdata(pdev, indio_dev); - - err = tiadc_request_dma(pdev, adc_dev); -- if (err && err == -EPROBE_DEFER) -+ if (err && err != -ENODEV) { -+ dev_err_probe(&pdev->dev, err, "DMA request failed\n"); - goto err_dma; -+ } - - return 0; - diff --git a/queue-4.19/series b/queue-4.19/series index 6f7e016d172..2ef92f02cb9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -24,7 +24,6 @@ input-ipaq-micro-keys-add-error-handling-for-devm_km.patch scsi-bnx2fc-remove-set-but-not-used-variable-oxid.patch scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch -iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch wifi-cfg80211-add-my-certificate.patch wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch -- 2.47.3