From bc6c9a436283c48d407a1497c0cf3cb8c3d83888 Mon Sep 17 00:00:00 2001 From: Jessica Yu Date: Dec 02 2020 10:45:59 +0000 Subject: Merge branch 'users/pjakobsson/SLE15-SP3/for-next' into SLE15-SP3 Pull patch removal from Patrik Jakobsson. --- diff --git a/patches.suse/1239-media-cec-gpio-handle-gpiod_get_value-errors-correct.patch b/patches.suse/1239-media-cec-gpio-handle-gpiod_get_value-errors-correct.patch deleted file mode 100644 index 3d31711..0000000 --- a/patches.suse/1239-media-cec-gpio-handle-gpiod_get_value-errors-correct.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4cb449df42542fbb5bcc880fb0376450d8a83970 Mon Sep 17 00:00:00 2001 -From: Hans Verkuil -Date: Tue, 21 Apr 2020 11:23:41 +0200 -Subject: media: cec-gpio: handle gpiod_get_value errors correctly -Git-commit: e5ad7db4b2f35aaed796669b47e24c6d79cab3d0 -Patch-mainline: v5.8-rc1 -References: jsc#SLE-12680, jsc#SLE-12880, jsc#SLE-12882, jsc#SLE-12883, jsc#SLE-13496, jsc#SLE-15322 - -gpiod_get_value() can return negative values if an error occurs. -In several places this error code was ignored. - -Ensure that errors codes are handled correctly throughout the CEC -pin framework and CEC pin drivers. - -The return code of the cec_pin_ops read() callback had to be changed -from 'bool' to 'int', which mean the prototype of that callback in the -sun4i drm driver also had to be changed. - -Signed-off-by: Hans Verkuil -Reported-by: Dan Carpenter -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Patrik Jakobsson ---- - drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c -index e324d7db7b7d..ce07ddc3e058 100644 ---- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c -+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c -@@ -279,7 +279,7 @@ static const struct drm_connector_funcs sun4i_hdmi_connector_funcs = { - }; - - #ifdef CONFIG_DRM_SUN4I_HDMI_CEC --static bool sun4i_hdmi_cec_pin_read(struct cec_adapter *adap) -+static int sun4i_hdmi_cec_pin_read(struct cec_adapter *adap) - { - struct sun4i_hdmi *hdmi = cec_get_drvdata(adap); - --- -2.28.0 - diff --git a/series.conf b/series.conf index 4f10d3c..eb9477c 100644 --- a/series.conf +++ b/series.conf @@ -32524,7 +32524,6 @@ patches.suse/media-vicodec-Fix-error-codes-in-probe-function.patch patches.suse/media-platform-fcp-Set-appropriate-DMA-parameters.patch patches.suse/media-si2157-Better-check-for-running-tuner-in-init.patch - patches.suse/1239-media-cec-gpio-handle-gpiod_get_value-errors-correct.patch patches.suse/media-staging-ipu3-Fix-stale-list-entries-on-paramet.patch patches.suse/media-Revert-staging-imgu-Address-a-compiler-warning.patch patches.suse/media-staging-ipu3-imgu-Move-alignment-attribute-to-.patch