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

Commit ac9e59ca authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

USB: usbtmc: remove unnecessary memory allocation 



Inside usbtmc_ioctl_clear_out_halt()/usbtmc_ioctl_clear_in_halt(),
usb_clear_halt() needn't any buffer to pass in, so remove the
unnecessary memory allocation.

Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c33c888b

drivers/usb/class/usbtmc.c

+4 −22
Original line number Diff line number Diff line
@@ -718,51 +718,33 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data) 


static int usbtmc_ioctl_clear_out_halt(struct usbtmc_device_data *data)

{

	u8 *buffer;

	int rv;



	buffer = kmalloc(2, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;



	rv = usb_clear_halt(data->usb_dev,

			    usb_sndbulkpipe(data->usb_dev, data->bulk_out));



	if (rv < 0) {

		dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",

			rv);

		goto exit;

	}

	rv = 0;



exit:

	kfree(buffer);

		return rv;

	}

	return 0;

}



static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)

{

	u8 *buffer;

	int rv;



	buffer = kmalloc(2, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;



	rv = usb_clear_halt(data->usb_dev,

			    usb_rcvbulkpipe(data->usb_dev, data->bulk_in));



	if (rv < 0) {

		dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",

			rv);

		goto exit;

	}

	rv = 0;



exit:

	kfree(buffer);

		return rv;

	}

	return 0;

}



static int get_capabilities(struct usbtmc_device_data *data)

{