forked from Minki/linux
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>
This commit is contained in:
parent
bbf4976e77
commit
e6c7efdcb7
@ -121,7 +121,6 @@ static void usbtmc_delete(struct kref *kref)
|
|||||||
struct usbtmc_device_data *data = to_usbtmc_data(kref);
|
struct usbtmc_device_data *data = to_usbtmc_data(kref);
|
||||||
|
|
||||||
usb_put_dev(data->usb_dev);
|
usb_put_dev(data->usb_dev);
|
||||||
kfree(data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int usbtmc_open(struct inode *inode, struct file *filp)
|
static int usbtmc_open(struct inode *inode, struct file *filp)
|
||||||
@ -1101,7 +1100,7 @@ static int usbtmc_probe(struct usb_interface *intf,
|
|||||||
|
|
||||||
dev_dbg(&intf->dev, "%s called\n", __func__);
|
dev_dbg(&intf->dev, "%s called\n", __func__);
|
||||||
|
|
||||||
data = kmalloc(sizeof(struct usbtmc_device_data), GFP_KERNEL);
|
data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
dev_err(&intf->dev, "Unable to allocate kernel memory\n");
|
dev_err(&intf->dev, "Unable to allocate kernel memory\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
Loading…
Reference in New Issue
Block a user