Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0706930 authored by Duncan Sands's avatar Duncan Sands Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: usbatm kcalloc cleanup 



you seem to have applied the original, not the new improved one with
whiter teeth that uses kcalloc instead of kmalloc + memset.  Here's a
patch that goes on top of the one you applied.

Signed-off-by: default avatarDuncan Sands <baldrick@free.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 843c944f

drivers/usb/atm/usbatm.c

+1 −4
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
	struct usb_device *usb_dev = interface_to_usbdev(intf);

	struct usbatm_data *instance;

	char *buf;

	size_t instance_size = sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs);

	int error = -ENOMEM;

	int i, length;

	int need_heavy;
@@ -961,14 +960,12 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
			intf->altsetting->desc.bInterfaceNumber);



	/* instance init */

	instance = kmalloc(instance_size, GFP_KERNEL);

	instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);

	if (!instance) {

		dev_dbg(dev, "%s: no memory for instance data!\n", __func__);

		return -ENOMEM;

	}



	memset(instance, 0, instance_size);



	/* public fields */



	instance->driver = driver;