From: Ben Dooks Ensure we free our 'struct ili9320' on exit or error. Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton --- drivers/video/backlight/ili9320.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff -puN drivers/video/backlight/ili9320.c~fb-add-support-for-the-ili9320-video-display-controller-fix drivers/video/backlight/ili9320.c --- a/drivers/video/backlight/ili9320.c~fb-add-support-for-the-ili9320-video-display-controller-fix +++ a/drivers/video/backlight/ili9320.c @@ -259,18 +259,19 @@ int __devinit ili9320_probe_spi(struct s lcd_device_unregister(lcd); err_free: - kfree(lcd); + kfree(ili); + return ret; } EXPORT_SYMBOL_GPL(ili9320_probe_spi); -int __devexit ili9320_remove(struct ili9320 *lcd) +int __devexit ili9320_remove(struct ili9320 *ili) { - ili9320_power(lcd, FB_BLANK_POWERDOWN); + ili9320_power(ili, FB_BLANK_POWERDOWN); - lcd_device_unregister(lcd->lcd); - kfree(lcd); + lcd_device_unregister(ili->lcd); + kfree(ili); return 0; } _