leds-lp55xx: fix problem on removing LED attributes

[firefly-linux-kernel-4.4.55.git] / drivers / leds / leds-pca9532.c

diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index cee8a5b483ac50a59d16731c154639ede3bad03f..0c597bdd23f9d175ed4e6ad69af6b446d02746f9 100644 (file)
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -186,7 +186,7 @@ static int pca9532_set_blink(struct led_classdev *led_cdev,
        int err = 0;
 
        if (*delay_on == 0 && *delay_off == 0) {
-       /* led subsystem ask us for a blink rate */
+               /* led subsystem ask us for a blink rate */
                *delay_on = 1000;
                *delay_off = 1000;
        }
@@ -311,7 +311,6 @@ static int pca9532_destroy_devices(struct pca9532_data *data, int n_devs)
                        break;
                case PCA9532_TYPE_N2100_BEEP:
                        if (data->idev != NULL) {
-                               input_unregister_device(data->idev);
                                cancel_work_sync(&data->work);
                                data->idev = NULL;
                        }
@@ -382,7 +381,7 @@ static int pca9532_configure(struct i2c_client *client,
                        BUG_ON(data->idev);
                        led->state = PCA9532_PWM1;
                        pca9532_setled(led);
-                       data->idev = input_allocate_device();
+                       data->idev = devm_input_allocate_device(&client->dev);
                        if (data->idev == NULL) {
                                err = -ENOMEM;
                                goto exit;
@@ -401,7 +400,6 @@ static int pca9532_configure(struct i2c_client *client,
                        INIT_WORK(&data->work, pca9532_input_work);
                        err = input_register_device(data->idev);
                        if (err) {
-                               input_free_device(data->idev);
                                cancel_work_sync(&data->work);
                                data->idev = NULL;
                                goto exit;