mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
557411eb2c
commit
6acf70f078
|
@ -356,7 +356,7 @@ static void fw_dev_release(struct device *dev)
|
||||||
__free_page(fw_priv->pages[i]);
|
__free_page(fw_priv->pages[i]);
|
||||||
kfree(fw_priv->pages);
|
kfree(fw_priv->pages);
|
||||||
kfree(fw_priv);
|
kfree(fw_priv);
|
||||||
kfree(dev);
|
put_device(dev);
|
||||||
|
|
||||||
module_put(THIS_MODULE);
|
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);
|
retval = device_register(f_dev);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
dev_err(device, "%s: device_register failed\n", __func__);
|
dev_err(device, "%s: device_register failed\n", __func__);
|
||||||
goto error_kfree;
|
put_device(f_dev);
|
||||||
|
goto error_kfree1;
|
||||||
}
|
}
|
||||||
*dev_p = f_dev;
|
*dev_p = f_dev;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error_kfree:
|
error_kfree:
|
||||||
kfree(fw_priv);
|
|
||||||
kfree(f_dev);
|
kfree(f_dev);
|
||||||
|
error_kfree1:
|
||||||
|
kfree(fw_priv);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue