* ohci-at91 mismerge build error
@ 2014-01-07 11:54 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2014-01-07 11:54 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, linux-arm-kernel, Alan Stern, Nicolas Ferre,
Boris BREZILLON, linux-usb
After commit 99f14bd4d1 "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: Arnd Bergmann <arnd@arndb.de>
---
Please just ignore if this has been reported before
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 2d0ee5e..091ae49 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ohci-at91 mismerge build error
@ 2014-01-07 11:54 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2014-01-07 11:54 UTC (permalink / raw)
To: linux-arm-kernel
After commit 99f14bd4d1 "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: Arnd Bergmann <arnd@arndb.de>
---
Please just ignore if this has been reported before
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 2d0ee5e..091ae49 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: ohci-at91 mismerge build error
2014-01-07 11:54 ` Arnd Bergmann
@ 2014-01-07 12:05 ` boris brezillon
-1 siblings, 0 replies; 4+ messages in thread
From: boris brezillon @ 2014-01-07 12:05 UTC (permalink / raw)
To: Arnd Bergmann, Greg Kroah-Hartman
Cc: linux-kernel, linux-arm-kernel, Alan Stern, Nicolas Ferre, linux-usb
Hello Arnd,
On 07/01/2014 12:54, Arnd Bergmann wrote:
> After commit 99f14bd4d1 "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.
Thanks for fixing this: I was about to propose the same patch to resolve
the issue introduced by this merge (reported by Olof yesterday).
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
> ---
> Please just ignore if this has been reported before
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 2d0ee5e..091ae49 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* ohci-at91 mismerge build error
@ 2014-01-07 12:05 ` boris brezillon
0 siblings, 0 replies; 4+ messages in thread
From: boris brezillon @ 2014-01-07 12:05 UTC (permalink / raw)
To: linux-arm-kernel
Hello Arnd,
On 07/01/2014 12:54, Arnd Bergmann wrote:
> After commit 99f14bd4d1 "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.
Thanks for fixing this: I was about to propose the same patch to resolve
the issue introduced by this merge (reported by Olof yesterday).
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
> ---
> Please just ignore if this has been reported before
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 2d0ee5e..091ae49 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-07 12:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-07 11:54 ohci-at91 mismerge build error Arnd Bergmann
2014-01-07 11:54 ` Arnd Bergmann
2014-01-07 12:05 ` boris brezillon
2014-01-07 12:05 ` boris brezillon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.