On 22/06/2020 12:05, Dariusz Marcinkiewicz wrote:
> 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 (via 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 value.
> 
> Signed-off-by: Dariusz Marcinkiewicz <[email protected]>

This can be CCed to stable, I guess?

Can you provide a Fixes: tag as well?

Regards,

        Hans

> ---
>  drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c 
> b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
> index 0e7e2772f08f..2d95e16cd248 100644
> --- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
> +++ b/drivers/media/cec/platform/cros-ec/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,
> 

Reply via email to