Commit dd2057e5 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: core: drop OOM message 



Drop redundant OOM message on allocation failures which would already
have been logged by the allocator. This also allows us to clean up the
error paths somewhat.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20191008090240.30376-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a9a8a4c

drivers/usb/core/config.c

+5 −7
Original line number Diff line number Diff line
@@ -800,10 +800,10 @@ int usb_get_configuration(struct usb_device *dev) 
{

	struct device *ddev = &dev->dev;

	int ncfg = dev->descriptor.bNumConfigurations;

	int result = -ENOMEM;

	unsigned int cfgno, length;

	unsigned char *bigbuffer;

	struct usb_config_descriptor *desc;

	int result;



	if (ncfg > USB_MAXCONFIG) {

		dev_warn(ddev, "too many configurations: %d, "
@@ -819,16 +819,16 @@ int usb_get_configuration(struct usb_device *dev) 
	length = ncfg * sizeof(struct usb_host_config);

	dev->config = kzalloc(length, GFP_KERNEL);

	if (!dev->config)

		goto err2;

		return -ENOMEM;



	length = ncfg * sizeof(char *);

	dev->rawdescriptors = kzalloc(length, GFP_KERNEL);

	if (!dev->rawdescriptors)

		goto err2;

		return -ENOMEM;



	desc = kmalloc(USB_DT_CONFIG_SIZE, GFP_KERNEL);

	if (!desc)

		goto err2;

		return -ENOMEM;



	for (cfgno = 0; cfgno < ncfg; cfgno++) {

		/* We grab just the first descriptor so we know how long
@@ -890,9 +890,7 @@ int usb_get_configuration(struct usb_device *dev) 
err:

	kfree(desc);

	dev->descriptor.bNumConfigurations = cfgno;

err2:

	if (result == -ENOMEM)

		dev_err(ddev, "out of memory\n");



	return result;

}