The patch titled
gpio-patchset-fixups: scx200 init undo malloc
has been added to the -mm tree. Its filename is
chardev-gpio-for-scx200-pc-8736x-add-platforn_device-scx200-init-undo-malloc.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: gpio-patchset-fixups: scx200 init undo malloc
From: Jim Cromie <jim.cromie@xxxxxxxxx>
If platform_device_add() fails, the add doesnt need to be undone. What is
needed it to undo the previous malloc.
Signed-off-by: Jim Cromie <jim.cromie@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/scx200_gpio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/char/scx200_gpio.c~chardev-gpio-for-scx200-pc-8736x-add-platforn_device-scx200-init-undo-malloc drivers/char/scx200_gpio.c
--- a/drivers/char/scx200_gpio.c~chardev-gpio-for-scx200-pc-8736x-add-platforn_device-scx200-init-undo-malloc
+++ a/drivers/char/scx200_gpio.c
@@ -138,7 +138,7 @@ static int __init scx200_gpio_init(void)
rc = platform_device_add(pdev);
if (rc)
- goto undo_platform_device_add;
+ goto undo_malloc;
if (major)
rc = register_chrdev_region(dev, num_pins, "scx200_gpio");
@@ -171,7 +171,8 @@ undo_chrdev_region:
unregister_chrdev_region(dev, num_pins);
undo_platform_device_add:
platform_device_put(pdev);
- kfree(pdev); /* undo platform_device_alloc */
+undo_malloc:
+ kfree(pdev);
return rc;
}
_
Patches currently in -mm which might be from jim.cromie@xxxxxxxxx are
chardev-gpio-for-scx200-pc-8736x-whitespace.patch
chardev-gpio-for-scx200-pc-8736x-modernize.patch
chardev-gpio-for-scx200-pc-8736x-add-platforn_device.patch
chardev-gpio-for-scx200-pc-8736x-add-platforn_device-static-numpins.patch
chardev-gpio-for-scx200-pc-8736x-add-platforn_device-enomem-on-device_add-failure.patch
chardev-gpio-for-scx200-pc-8736x-add-platforn_device-scx200-init-undo-malloc.patch
chardev-gpio-for-scx200-pc-8736x-device-minor.patch
chardev-gpio-for-scx200-pc-8736x-put-gpio_dump.patch
chardev-gpio-for-scx200-pc-8736x-add-v-command.patch
chardev-gpio-for-scx200-pc-8736x-refactor-scx200_probe.patch
chardev-gpio-for-scx200-pc-8736x-add-gpio-ops.patch
chardev-gpio-for-scx200-pc-8736x-dispatch.patch
chardev-gpio-for-scx200-pc-8736x-add-empty.patch
chardev-gpio-for-scx200-pc-8736x-migrate-file-ops.patch
chardev-gpio-for-scx200-pc-8736x-migrate-gpio_dump.patch
chardev-gpio-for-scx200-pc-8736x-add-new-pc8736x_gpio.patch
chardev-gpio-for-scx200-pc-8736x-add-new-pc8736x_gpio-no-static-init.patch
chardev-gpio-for-scx200-pc-8736x-add-new-pc8736x_gpio-no-weird-comment-placement.patch
chardev-gpio-for-scx200-pc-8736x-add-new-pc8736x_gpio-fixups.patch
chardev-gpio-for-scx200-pc-8736x-add-platform_device.patch
chardev-gpio-for-scx200-pc-8736x-add-platform_device-request-region.patch
chardev-gpio-for-scx200-pc-8736x-add-platform_device-request-region-series.patch
chardev-gpio-for-scx200-pc-8736x-use-dev_dbg.patch
chardev-gpio-for-scx200-pc-8736x-use-dev_dbg-extern-to-header.patch
chardev-gpio-for-scx200-pc-8736x-fix-gpio_current.patch
chardev-gpio-for-scx200-pc-8736x-fix-gpio_current-make-precedence-explicit.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-fix.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-include-linux-ioh.patch
chardev-gpio-for-scx200-pc-8736x-display-pin.patch
chardev-gpio-for-scx200-pc-8736x-add-proper.patch
generic-time-add-macro-to-simplify-hide-mask.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
