diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2009-04-23 22:31:52 +0800 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-11 10:02:16 +1000 |
| commit | ba26cd54617b12e6ce7efbeb6b7c02629aa4904a (patch) | |
| tree | fc04e0836b0f751cdae6183b1536e333c43dbedd /drivers/base | |
| parent | ca42d6cbbd3a5e4a411d0eda9702d361cca51d7b (diff) | |
driver core: firmware_class: replace kfree(dev) with put_device(dev)
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>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/firmware_class.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index d3a59c688fe4..fc475491b6ca 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -279,7 +279,7 @@ static void fw_dev_release(struct device *dev) struct firmware_priv *fw_priv = dev_get_drvdata(dev); kfree(fw_priv); - kfree(dev); + put_device(dev); module_put(THIS_MODULE); } @@ -323,14 +323,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; } |