Merge branch 'akpm/master'

[karo-tx-linux.git] / drivers / video / backlight / tosa_bl.c

diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 49342e1d20beaba317d948219bcea9073499c662..3fd529224c73a0b5b05fe235c76c67c7d8b2a5d4 100644 (file)
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -90,16 +90,15 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
        if (!data)
                return -ENOMEM;
 
-       data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
+       data->comadj = sharpsl_param.comadj == -1 ?
+                       COMADJ_DEFAULT : sharpsl_param.comadj;
 
-       ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight");
+       ret = devm_gpio_request_one(&client->dev, TOSA_GPIO_BL_C20MA,
+                               GPIOF_OUT_INIT_LOW, "backlight");
        if (ret) {
                dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
                return ret;
        }
-       ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
-       if (ret)
-               return ret;
 
        i2c_set_clientdata(client, data);
        data->i2c = client;
@@ -163,7 +162,6 @@ static const struct i2c_device_id tosa_bl_id[] = {
        { },
 };
 
-
 static struct i2c_driver tosa_bl_driver = {
        .driver = {
                .name           = "tosa-bl",