driver core: firmware_class: replace kfree(dev) with put_device(dev)
authorMing Lei <tom.leiming@gmail.com>
Thu, 23 Apr 2009 14:31:52 +0000 (22:31 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Jun 2009 04:30:24 +0000 (21:30 -0700)
against v2.6.30-rc3-next tree.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/base/firmware_class.c

index 8a267c4276291bb775e2590a6935825ae35e9305..2d296b7f703462f100c96c64550b11d8dd78dfef 100644 (file)
@@ -356,7 +356,7 @@ static void fw_dev_release(struct device *dev)
                __free_page(fw_priv->pages[i]);
        kfree(fw_priv->pages);
        kfree(fw_priv);
-       kfree(dev);
+       put_device(dev);
 
        module_put(THIS_MODULE);
 }
@@ -400,14 +400,16 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
        retval = device_register(f_dev);
        if (retval) {
                dev_err(device, "%s: device_register failed\n", __func__);
-               goto error_kfree;
+               put_device(f_dev);
+               goto error_kfree1;
        }
        *dev_p = f_dev;
        return 0;
 
 error_kfree:
-       kfree(fw_priv);
        kfree(f_dev);
+error_kfree1:
+       kfree(fw_priv);
        return retval;
 }