The patch titled ili9320: ensure resource cleanup on exit has been removed from the -mm tree. Its filename was fb-add-support-for-the-ili9320-video-display-controller-fix.patch This patch was dropped because it was folded into fb-add-support-for-the-ili9320-video-display-controller.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ili9320: ensure resource cleanup on exit From: Ben Dooks <ben-linux@xxxxxxxxx> Ensure we free our 'struct ili9320' on exit or error. Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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; } _ Patches currently in -mm which might be from ben-linux@xxxxxxxxx are origin.patch rtc-rtc-s3c-add-__devexit-and-__devinit-markers.patch rtc-rtc-s3c-update-irq-handling.patch sm501-add-inversion-controls-for-vbiasen-and-fpen.patch sm501-restructure-init-to-allow-only-1-fb-on-an-sm501.patch sm501-fixup-allocation-code-to-be-64bit-resource-compliant.patch fb-add-support-for-the-ili9320-video-display-controller.patch fb-add-support-for-the-ili9320-video-display-controller-fix.patch lcd-add-lcd_device-to-check_fb-entry-in-lcd_ops.patch lcd-add-platform_lcd-driver.patch lcd-add-platform_lcd-driver-fix.patch lcd-add-platform_lcd-driver-fb-fix-platform_lcd-match-entry.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html