diff --git a/[refs] b/[refs] index 16993dd69038..897cf1d9fb71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a8fe5d8cc180b9c2c3c08509b458199c26bc5ff +refs/heads/master: 5a5a07436669b3072fbe9f06d27667ec6db62bf5 diff --git a/trunk/drivers/video/backlight/lms283gf05.c b/trunk/drivers/video/backlight/lms283gf05.c index b29c7071c9db..b7ad0d526bf7 100644 --- a/trunk/drivers/video/backlight/lms283gf05.c +++ b/trunk/drivers/video/backlight/lms283gf05.c @@ -158,13 +158,9 @@ static int lms283gf05_probe(struct spi_device *spi) int ret = 0; if (pdata != NULL) { - ret = devm_gpio_request(&spi->dev, pdata->reset_gpio, - "LMS285GF05 RESET"); - if (ret) - return ret; - - ret = gpio_direction_output(pdata->reset_gpio, - !pdata->reset_inverted); + ret = devm_gpio_request_one(&spi->dev, pdata->reset_gpio, + GPIOF_DIR_OUT | !pdata->reset_inverted, + "LMS285GF05 RESET"); if (ret) return ret; }