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

Commit 1f53b485 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

USB: fix: ohci-at91 mismerge build error 



After commit 99f14bd4 "Merge 3.13-rc5 into usb-next" (in linux-next as of
today), I'm getting this error building any at91 kernel:

drivers/usb/host/ohci-at91.c: In function 'usb_hcd_at91_probe':
drivers/usb/host/ohci-at91.c:190:4: error: label 'err' used but not defined
    goto err;
    ^
drivers/usb/host/ohci-at91.c: At top level:
drivers/usb/host/ohci-at91.c:206:2: warning: data definition has no type or storage class [enabled by default]
  at91_stop_hc(pdev);
  ^
...

The problem is obviously a mismerge between two unrelated changes that
resulted in missing opening braces.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd6383c8

drivers/usb/host/ohci-at91.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, 
	at91_start_hc(pdev);



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (retval == 0)

	if (retval == 0) {

		device_wakeup_enable(hcd->self.controller);

		return retval;

	}