| From ffb83e4d7033d370d4e837e2112dc02a31e854c9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 22 Jun 2020 13:46:36 +0200 |
| Subject: media: cros-ec-cec: do not bail on device_init_wakeup failure |
| |
| From: Dariusz Marcinkiewicz <darekm@google.com> |
| |
| [ 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 | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c |
| index 0e7e2772f08f9..2d95e16cd2489 100644 |
| --- a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c |
| +++ b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c |
| @@ -277,11 +277,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, |
| -- |
| 2.25.1 |
| |