2007-10-30 20:31:49

by Adrian Bunk

Subject: [2.6 patch] fix drivers/net/wan/lmc/ compilation

Documentation/SubmitChecklist, point 1:

<-- snip -->

...
CC drivers/net/wan/lmc/lmc_main.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/wan/lmc/lmc_main.c: In function ‘lmc_ioctl’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/wan/lmc/lmc_main.c:239: error: expected expression before ‘else’
...
make[5]: *** [drivers/net/wan/lmc/lmc_main.o] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

---
d5e92a30491abf073e0a7f4d46b466c7c97f0f61
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 64eb578..37c52e1 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -234,7 +234,7 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
sc->lmc_xinfo.Magic1 = 0xDEADBEEF;

if (copy_to_user(ifr->ifr_data, &sc->lmc_xinfo,
- sizeof(struct lmc_xinfo))) {
+ sizeof(struct lmc_xinfo)))
ret = -EFAULT;
else
ret = 0;

2007-10-30 20:46:36

by Roel Kluin

Subject: Re: [2.6 patch] fix drivers/net/wan/lmc/ compilation

Adrian Bunk wrote:
> Documentation/SubmitChecklist, point 1:
>
> <-- snip -->
>
> ...
> CC drivers/net/wan/lmc/lmc_main.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/wan/lmc/lmc_main.c: In function ‘lmc_ioctl’:
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/wan/lmc/lmc_main.c:239: error: expected expression before ‘else’
> ...
> make[5]: *** [drivers/net/wan/lmc/lmc_main.o] Error 1
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> d5e92a30491abf073e0a7f4d46b466c7c97f0f61
> diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
> index 64eb578..37c52e1 100644
> --- a/drivers/net/wan/lmc/lmc_main.c
> +++ b/drivers/net/wan/lmc/lmc_main.c
> @@ -234,7 +234,7 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
> sc->lmc_xinfo.Magic1 = 0xDEADBEEF;
>
> if (copy_to_user(ifr->ifr_data, &sc->lmc_xinfo,
> - sizeof(struct lmc_xinfo))) {
> + sizeof(struct lmc_xinfo)))
> ret = -EFAULT;
> else
> ret = 0;
>

I am sorry, my patch broke this and Kristov Provost also noticed this.
See http://lkml.org/lkml/2007/10/30/355