]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: cros-ec-cec: do not bail on device_init_wakeup failure
authorDariusz Marcinkiewicz <darekm@google.com>
Mon, 22 Jun 2020 11:46:36 +0000 (13:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:16:10 +0000 (08:16 +0200)
[ Upstream commit 6f01dfb760c027d5dd6199d91ee9599f2676b5c6 ]

Do not fail probing when device_init_wakeup fails.

device_init_wakeup fails when the device is already enabled as wakeup
device. Hence, the driver fails to probe the device if:
- The device has already been enabled for wakeup (by e.g. sysfs)
- The driver has been unloaded and is being loaded again.

This goal of the patch is to fix the above cases.

Overwhelming majority of the drivers do not check device_init_wakeup
return code.

Fixes: cd70de2d356ee ("media: platform: Add ChromeOS EC CEC driver")
Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/cros-ec-cec/cros-ec-cec.c

index 4a3b3810fd895691488e1c97c329944306189669..31390ce2dbf2d4f3c1243ac1f8181d5e310da720 100644 (file)
@@ -278,11 +278,7 @@ static int cros_ec_cec_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, cros_ec_cec);
        cros_ec_cec->cros_ec = cros_ec;
 
-       ret = device_init_wakeup(&pdev->dev, 1);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to initialize wakeup\n");
-               return ret;
-       }
+       device_init_wakeup(&pdev->dev, 1);
 
        cros_ec_cec->adap = cec_allocate_adapter(&cros_ec_cec_ops, cros_ec_cec,
                                                 DRV_NAME,