diff --git a/[refs] b/[refs] index 957b98c19ce6..b7a4c922ace2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b080945aa7670354364c8f9e1a3a07cbb97beb3 +refs/heads/master: 1713cb9d6069fac581fcea928f65ca6ca7c9facf diff --git a/trunk/drivers/leds/leds-wm831x-status.c b/trunk/drivers/leds/leds-wm831x-status.c index 444a68d8e17e..74a24cf897c3 100644 --- a/trunk/drivers/leds/leds-wm831x-status.c +++ b/trunk/drivers/leds/leds-wm831x-status.c @@ -237,7 +237,8 @@ static int wm831x_status_probe(struct platform_device *pdev) goto err; } - drvdata = kzalloc(sizeof(struct wm831x_status), GFP_KERNEL); + drvdata = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_status), + GFP_KERNEL); if (!drvdata) return -ENOMEM; dev_set_drvdata(&pdev->dev, drvdata); @@ -300,7 +301,6 @@ static int wm831x_status_probe(struct platform_device *pdev) err_led: led_classdev_unregister(&drvdata->cdev); - kfree(drvdata); err: return ret; } @@ -311,7 +311,6 @@ static int wm831x_status_remove(struct platform_device *pdev) device_remove_file(drvdata->cdev.dev, &dev_attr_src); led_classdev_unregister(&drvdata->cdev); - kfree(drvdata); return 0; }