diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2013-07-15 04:59:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 15:01:12 -0400 |
commit | e6c7efdcb76f11b04e3d3f71c8d764ab75c9423b (patch) | |
tree | 7a2eae3dbabbd3dacc611603452ea32f61535541 | |
parent | bbf4976e7715da4a3e3599a500eb20d6be8b5046 (diff) |
usbtmc: convert to devm_kzalloc
kfree(data) will be called implicitly.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/class/usbtmc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index d683f90a505b..60dd8918aeb9 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
@@ -121,7 +121,6 @@ static void usbtmc_delete(struct kref *kref) | |||
121 | struct usbtmc_device_data *data = to_usbtmc_data(kref); | 121 | struct usbtmc_device_data *data = to_usbtmc_data(kref); |
122 | 122 | ||
123 | usb_put_dev(data->usb_dev); | 123 | usb_put_dev(data->usb_dev); |
124 | kfree(data); | ||
125 | } | 124 | } |
126 | 125 | ||
127 | static int usbtmc_open(struct inode *inode, struct file *filp) | 126 | static int usbtmc_open(struct inode *inode, struct file *filp) |
@@ -1101,7 +1100,7 @@ static int usbtmc_probe(struct usb_interface *intf, | |||
1101 | 1100 | ||
1102 | dev_dbg(&intf->dev, "%s called\n", __func__); | 1101 | dev_dbg(&intf->dev, "%s called\n", __func__); |
1103 | 1102 | ||
1104 | data = kmalloc(sizeof(struct usbtmc_device_data), GFP_KERNEL); | 1103 | data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL); |
1105 | if (!data) { | 1104 | if (!data) { |
1106 | dev_err(&intf->dev, "Unable to allocate kernel memory\n"); | 1105 | dev_err(&intf->dev, "Unable to allocate kernel memory\n"); |
1107 | return -ENOMEM; | 1106 | return -ENOMEM; |