Commit a02b55c8 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

usb: misc: adutux: don't print on ENOMEM 



All kmalloc-based functions print enough information on failures.

Signed-off-by: default avatarWolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4c46f11

drivers/usb/misc/adutux.c

+3 −10
Original line number Diff line number Diff line
@@ -672,8 +672,7 @@ static int adu_probe(struct usb_interface *interface, 


	/* allocate memory for our device state and initialize it */

	dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL);

	if (dev == NULL) {

		dev_err(&interface->dev, "Out of memory\n");

	if (!dev) {

		retval = -ENOMEM;

		goto exit;

	}
@@ -710,7 +709,6 @@ static int adu_probe(struct usb_interface *interface, 


	dev->read_buffer_primary = kmalloc((4 * in_end_size), GFP_KERNEL);

	if (!dev->read_buffer_primary) {

		dev_err(&interface->dev, "Couldn't allocate read_buffer_primary\n");

		retval = -ENOMEM;

		goto error;

	}
@@ -723,7 +721,6 @@ static int adu_probe(struct usb_interface *interface, 


	dev->read_buffer_secondary = kmalloc((4 * in_end_size), GFP_KERNEL);

	if (!dev->read_buffer_secondary) {

		dev_err(&interface->dev, "Couldn't allocate read_buffer_secondary\n");

		retval = -ENOMEM;

		goto error;

	}
@@ -735,10 +732,8 @@ static int adu_probe(struct usb_interface *interface, 
	memset(dev->read_buffer_secondary + (3 * in_end_size), 'h', in_end_size);



	dev->interrupt_in_buffer = kmalloc(in_end_size, GFP_KERNEL);

	if (!dev->interrupt_in_buffer) {

		dev_err(&interface->dev, "Couldn't allocate interrupt_in_buffer\n");

	if (!dev->interrupt_in_buffer)

		goto error;

	}



	/* debug code prime the buffer */

	memset(dev->interrupt_in_buffer, 'i', in_end_size);
@@ -747,10 +742,8 @@ static int adu_probe(struct usb_interface *interface, 
	if (!dev->interrupt_in_urb)

		goto error;

	dev->interrupt_out_buffer = kmalloc(out_end_size, GFP_KERNEL);

	if (!dev->interrupt_out_buffer) {

		dev_err(&interface->dev, "Couldn't allocate interrupt_out_buffer\n");

	if (!dev->interrupt_out_buffer)

		goto error;

	}

	dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->interrupt_out_urb)

		goto error;