]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] media: st-rc: move to using reset_control_get_optional
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Mon, 22 Sep 2014 22:22:26 +0000 (19:22 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 23 Sep 2014 20:03:57 +0000 (17:03 -0300)
This patch fixes a compilation error while building with the
random kernel configuration.

drivers/media/rc/st_rc.c: In function 'st_rc_probe':
drivers/media/rc/st_rc.c:281:2: error: implicit declaration of
function 'reset_control_get' [-Werror=implicit-function-declaration]
  rc_dev->rstc = reset_control_get(dev, NULL);

drivers/media/rc/st_rc.c:281:15: warning: assignment makes pointer
from integer without a cast [enabled by default]
  rc_dev->rstc = reset_control_get(dev, NULL);

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/rc/st_rc.c

index 5c151351afa4c72f48ccf9e48b88abe48cfc8331..e0f13125bf06430ac570886ab0a639fc4d712c96 100644 (file)
@@ -278,7 +278,7 @@ static int st_rc_probe(struct platform_device *pdev)
                rc_dev->rx_base = rc_dev->base;
 
 
-       rc_dev->rstc = reset_control_get(dev, NULL);
+       rc_dev->rstc = reset_control_get_optional(dev, NULL);
        if (IS_ERR(rc_dev->rstc))
                rc_dev->rstc = NULL;