Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / ltv350qv.c

diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index ed1b3926813162d19644a8957c4c36a19a574549..383f550e165ec0070809bf56799cdb3e0a52ac44 100644 (file)
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -242,7 +242,8 @@ static int ltv350qv_probe(struct spi_device *spi)
        if (!lcd->buffer)
                return -ENOMEM;
 
-       ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
+       ld = devm_lcd_device_register(&spi->dev, "ltv350qv", &spi->dev, lcd,
+                                       &ltv_ops);
        if (IS_ERR(ld))
                return PTR_ERR(ld);
 
@@ -250,15 +251,11 @@ static int ltv350qv_probe(struct spi_device *spi)
 
        ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
        if (ret)
-               goto out_unregister;
+               return ret;
 
        spi_set_drvdata(spi, lcd);
 
        return 0;
-
-out_unregister:
-       lcd_device_unregister(ld);
-       return ret;
 }
 
 static int ltv350qv_remove(struct spi_device *spi)
@@ -266,8 +263,6 @@ static int ltv350qv_remove(struct spi_device *spi)
        struct ltv350qv *lcd = spi_get_drvdata(spi);
 
        ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
-       lcd_device_unregister(lcd->ld);
-
        return 0;
 }