Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38

[mv-sheeva.git] / drivers / firmware / dmi-id.c

diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index a777a35381d2ca80ac0dd8846d860d650ef7bf00..94a58a082b9930a2acc05192273c6941ef003ef6 100644 (file)
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -229,10 +229,12 @@ static int __init dmi_id_init(void)
 
        ret = device_register(dmi_dev);
        if (ret)
-               goto fail_class_unregister;
+               goto fail_free_dmi_dev;
 
        return 0;
 
+fail_free_dmi_dev:
+       kfree(dmi_dev);
 fail_class_unregister:
 
        class_unregister(&dmi_class);