Messages in this thread Patch in this message | | | Subject | Re: [PATCH] request_firmware(): fixes and polishing. | Date | Wed, 25 Feb 2004 02:34:49 +0100 | From | Manuel Estrada Sainz <> |
| |
Based on patch and suggestions from Dmitry Torokhov
Changelog: - release 'struct firmware_priv' from class_dev->release.
Index: linux-2.5/drivers/base/firmware_class.c =================================================================== --- linux-2.5.orig/drivers/base/firmware_class.c 2004-01-06 13:30:48.000000000 +0100 +++ linux-2.5/drivers/base/firmware_class.c 2004-01-06 13:31:38.000000000 +0100 @@ -232,6 +232,9 @@ static void fw_class_dev_release(struct class_device *class_dev) { + struct firmware_priv *fw_priv = class_get_devdata(class_dev); + + kfree(fw_priv); kfree(class_dev); } @@ -258,6 +261,8 @@ struct class_device *class_dev = kmalloc(sizeof (struct class_device), GFP_KERNEL); + *class_dev_p = NULL; + if (!fw_priv || !class_dev) { printk(KERN_ERR "%s: kmalloc failed\n", __FUNCTION__); retval = -ENOMEM; @@ -318,10 +323,11 @@ sysfs_remove_bin_file(&class_dev->kobj, &fw_priv->attr_data); error_unreg_class_dev: class_device_unregister(class_dev); + goto out; + error_kfree: kfree(fw_priv); kfree(class_dev); - *class_dev_p = NULL; out: return retval; } @@ -374,7 +380,6 @@ wait_for_completion(&fw_priv->completion); del_timer_sync(&fw_priv->timeout); - fw_remove_class_device(class_dev); if (fw_priv->fw->size && !test_bit(FW_STATUS_ABORT, &fw_priv->status)) { *firmware = fw_priv->fw; @@ -383,7 +388,7 @@ vfree(fw_priv->fw->data); kfree(fw_priv->fw); } - kfree(fw_priv); + fw_remove_class_device(class_dev); out: return retval; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |