media: cec-gpio: handle gpiod_get_value errors correctly

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 <hverkuil-cisco@xs4all.nl>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 68d4644ac2dcc32a2d4118d824f13eba5d284921..126e1517ade2f1a85533bcc6a59af4f78cc349bb 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -282,7 +282,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);
 

diff --git a/drivers/media/cec/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
index 42d2c2cd9a786cd0e5615a45951cf876a4b1a0c8..c8c4efc83f5f06f162cfcd5dde12f031c474d74c 100644 (file)
--- a/drivers/media/cec/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
@@ -31,12 +31,12 @@ struct cec_gpio {
        ktime_t                 v5_ts;
 };
 
-static bool cec_gpio_read(struct cec_adapter *adap)
+static int cec_gpio_read(struct cec_adapter *adap)
 {
        struct cec_gpio *cec = cec_get_drvdata(adap);
 
        if (cec->cec_is_low)
-               return false;
+               return 0;
        return gpiod_get_value(cec->cec_gpio);
 }
 
@@ -71,9 +71,10 @@ static irqreturn_t cec_hpd_gpio_irq_handler_thread(int irq, void *priv)
 static irqreturn_t cec_5v_gpio_irq_handler(int irq, void *priv)
 {
        struct cec_gpio *cec = priv;
-       bool is_high = gpiod_get_value(cec->v5_gpio);
+       int val = gpiod_get_value(cec->v5_gpio);
+       bool is_high = val > 0;
 
-       if (is_high == cec->v5_is_high)
+       if (val < 0 || is_high == cec->v5_is_high)
                return IRQ_HANDLED;
        cec->v5_ts = ktime_get();
        cec->v5_is_high = is_high;
@@ -91,9 +92,10 @@ static irqreturn_t cec_5v_gpio_irq_handler_thread(int irq, void *priv)
 static irqreturn_t cec_hpd_gpio_irq_handler(int irq, void *priv)
 {
        struct cec_gpio *cec = priv;
-       bool is_high = gpiod_get_value(cec->hpd_gpio);
+       int val = gpiod_get_value(cec->hpd_gpio);
+       bool is_high = val > 0;
 
-       if (is_high == cec->hpd_is_high)
+       if (val < 0 || is_high == cec->hpd_is_high)
                return IRQ_HANDLED;
        cec->hpd_ts = ktime_get();
        cec->hpd_is_high = is_high;
@@ -103,8 +105,10 @@ static irqreturn_t cec_hpd_gpio_irq_handler(int irq, void *priv)
 static irqreturn_t cec_gpio_irq_handler(int irq, void *priv)
 {
        struct cec_gpio *cec = priv;
+       int val = gpiod_get_value(cec->cec_gpio);
 
-       cec_pin_changed(cec->adap, gpiod_get_value(cec->cec_gpio));
+       if (val >= 0)
+               cec_pin_changed(cec->adap, val > 0);
        return IRQ_HANDLED;
 }
 

diff --git a/include/media/cec-pin.h b/include/media/cec-pin.h
index 88c8b016eb09ffd6c6322f96796f1c5a1573bf98..483bc4769fe9469ff3e78f92d365e57104dd2934 100644 (file)
--- a/include/media/cec-pin.h
+++ b/include/media/cec-pin.h
@@ -13,7 +13,8 @@
 
 /**
  * struct cec_pin_ops - low-level CEC pin operations
- * @read:      read the CEC pin. Return true if high, false if low.
+ * @read:      read the CEC pin. Returns > 0 if high, 0 if low, or an error
+ *             if negative.
  * @low:       drive the CEC pin low.
  * @high:      stop driving the CEC pin. The pull-up will drive the pin
  *             high, unless someone else is driving the pin low.
@@ -22,13 +23,10 @@
  * @free:      optional. Free any allocated resources. Called when the
  *             adapter is deleted.
  * @status:    optional, log status information.
- * @read_hpd:  read the HPD pin. Return true if high, false if low or
- *             an error if negative. If NULL or -ENOTTY is returned,
- *             then this is not supported.
- * @read_5v:   read the 5V pin. Return true if high, false if low or
- *             an error if negative. If NULL or -ENOTTY is returned,
- *             then this is not supported.
- *
+ * @read_hpd:  optional. Read the HPD pin. Returns > 0 if high, 0 if low or
+ *             an error if negative.
+ * @read_5v:   optional. Read the 5V pin. Returns > 0 if high, 0 if low or
+ *             an error if negative.
  * @received:  optional. High-level CEC message callback. Allows the driver
  *             to process CEC messages.
  *
@@ -36,7 +34,7 @@
  * cec pin framework to manipulate the CEC pin.
  */
 struct cec_pin_ops {
-       bool (*read)(struct cec_adapter *adap);
+       int  (*read)(struct cec_adapter *adap);
        void (*low)(struct cec_adapter *adap);
        void (*high)(struct cec_adapter *adap);
        bool (*enable_irq)(struct cec_adapter *adap);