Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[karo-tx-linux.git] / drivers / leds / leds-lm355x.c

diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c
index 4117235ba618d94647292adf3cacd272163a0eb3..d81a8e7afd6ce2a6ae3d21adfa95e4cb25a0d2fe 100644 (file)
--- a/drivers/leds/leds-lm355x.c
+++ b/drivers/leds/leds-lm355x.c
@@ -477,6 +477,7 @@ static int lm355x_probe(struct i2c_client *client,
        chip->cdev_flash.name = "flash";
        chip->cdev_flash.max_brightness = 16;
        chip->cdev_flash.brightness_set = lm355x_strobe_brightness_set;
+       chip->cdev_flash.default_trigger = "flash";
        err = led_classdev_register((struct device *)
                                    &client->dev, &chip->cdev_flash);
        if (err < 0)
@@ -486,6 +487,7 @@ static int lm355x_probe(struct i2c_client *client,
        chip->cdev_torch.name = "torch";
        chip->cdev_torch.max_brightness = 8;
        chip->cdev_torch.brightness_set = lm355x_torch_brightness_set;
+       chip->cdev_torch.default_trigger = "torch";
        err = led_classdev_register((struct device *)
                                    &client->dev, &chip->cdev_torch);
        if (err < 0)