Commit c688d621 authored Apr 30, 2015 by Greg Kroah-Hartman

USB: hcd.c: move assignment out of if () block



We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
CC: Dan Williams <dan.j.williams@intel.com>
CC: Antoine Tenart <antoine.tenart@free-electrons.com>
CC: Petr Mladek <pmladek@suse.cz>
CC: Michal Sojka <sojka@merica.cz>
CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
CC: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>

parent 0a9abb1e

drivers/usb/core/hcd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2691,7 +2691,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
		if ((retval = usb_register_bus(&hcd->self)) < 0)
		goto err_register_bus;

		if ((rhdev = usb_alloc_dev(NULL, &hcd->self, 0)) == NULL) {
		rhdev = usb_alloc_dev(NULL, &hcd->self, 0);
		if (rhdev == NULL) {
		dev_err(hcd->self.controller, "unable to allocate root hub\n");
		retval = -ENOMEM;
		goto err_allocate_root_hub;