Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

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

diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index b67485a595a8d25fc7304df78b4805162331b0be..9327cd1b3143a93962ef5595895a43f655439ee5 100644 (file)
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -220,7 +220,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
        /* allocate and initialse our state */
 
-       ili = kzalloc(sizeof(struct ili9320), GFP_KERNEL);
+       ili = devm_kzalloc(&spi->dev, sizeof(struct ili9320), GFP_KERNEL);
        if (ili == NULL) {
                dev_err(dev, "no memory for device\n");
                return -ENOMEM;
@@ -240,8 +240,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
        lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);
        if (IS_ERR(lcd)) {
                dev_err(dev, "failed to register lcd device\n");
-               ret = PTR_ERR(lcd);
-               goto err_free;
+               return PTR_ERR(lcd);
        }
 
        ili->lcd = lcd;
@@ -259,9 +258,6 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
  err_unregister:
        lcd_device_unregister(lcd);
 
- err_free:
-       kfree(ili);
-
        return ret;
 }
 
@@ -272,7 +268,6 @@ int ili9320_remove(struct ili9320 *ili)
        ili9320_power(ili, FB_BLANK_POWERDOWN);
 
        lcd_device_unregister(ili->lcd);
-       kfree(ili);
 
        return 0;
 }