usb: core: Simplify return value of usb_get_configuration() (f2fd71db) · Commits · 戴 / test

It is better to initialize the return value "result" to -ENOMEM than to 0. And because "result" takes the return value of usb_parse_configuration() which returns 0 for success, setting "result" to 0 at before and after of the for loop is unnecessary. Signed-off-by:

Suwan Kim <suwan.kim027@gmail.com> Acked-by:

Alan Stern <stern@rowland.harvard.edu> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/core/config.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -800,13 +800,12 @@ int usb_get_configuration(struct usb_device *dev)
		{
		struct device *ddev = &dev->dev;
		int ncfg = dev->descriptor.bNumConfigurations;
		int result = 0;
		int result = -ENOMEM;
		unsigned int cfgno, length;
		unsigned char *bigbuffer;
		struct usb_config_descriptor *desc;

		cfgno = 0;
		result = -ENOMEM;
		if (ncfg > USB_MAXCONFIG) {
		dev_warn(ddev, "too many configurations: %d, "
		"using maximum allowed: %d\n", ncfg, USB_MAXCONFIG);
		@@ -832,7 +831,6 @@ int usb_get_configuration(struct usb_device *dev)
		if (!desc)
		goto err2;

		result = 0;
		for (; cfgno < ncfg; cfgno++) {
		/* We grab just the first descriptor so we know how long
		* the whole configuration is */
		@@ -889,7 +887,6 @@ int usb_get_configuration(struct usb_device *dev)
		goto err;
		}
		}
		result = 0;

		err:
		kfree(desc);

Admin message