On Mon, Aug 8, 2011 at 11:17 AM, Axel Lin <axel.lin@xxxxxxxxx> wrote:
> device_create returns &struct device pointer on success, or ERR_PTR() on error.
> Thus if led_classdev_register fails, led_cdev->dev is always not NULL.
>
> Thus to unregister a successful registered led_classdev, we should check
> IS_ERR_OR_NULL macro for led_cdev->dev instead of checking if led_cdev->dev
> is NULL or not.
>
> we use IS_ERR_OR_NULL instead of IS_ERR because if we havn't call
> led_classdev_register, the led_cdev->dev is NULL.
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Corentin Chary <corentin.chary@xxxxxxxxx>
> ---
> drivers/platform/x86/asus-laptop.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index fa6d7ec..0e071fa 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -430,17 +430,17 @@ static enum led_brightness asus_kled_cdev_get(struct led_classdev *led_cdev)
>
> static void asus_led_exit(struct asus_laptop *asus)
> {
> - if (asus->mled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->mled.led.dev))
> led_classdev_unregister(&asus->mled.led);
> - if (asus->tled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->tled.led.dev))
> led_classdev_unregister(&asus->tled.led);
> - if (asus->pled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->pled.led.dev))
> led_classdev_unregister(&asus->pled.led);
> - if (asus->rled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->rled.led.dev))
> led_classdev_unregister(&asus->rled.led);
> - if (asus->gled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->gled.led.dev))
> led_classdev_unregister(&asus->gled.led);
> - if (asus->kled.led.dev)
> + if (!IS_ERR_OR_NULL(asus->kled.led.dev))
> led_classdev_unregister(&asus->kled.led);
> if (asus->led_workqueue) {
> destroy_workqueue(asus->led_workqueue);
> --
> 1.7.4.1
>
>
>
>
--
Corentin Chary
http://xf.iksaif.net
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
