Re: linux-next: build failure after merge of the usb tree

[Stephen Rothwell]

Hi Greg,

On Mon, 13 Sep 2010 21:08:03 -0700 Greg KH <greg@xxxxxxxxx> wrote:
>
> On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > In file included from drivers/usb/gadget/ether.c:123:
> > drivers/usb/gadget/rndis.c: In function 'rndis_init':
> > drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> > 
> > Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
> > rndis: fix up coding style issues in the file").
> > 
> > I used the version of the usb tree from next-20100913 for today.
> 
> I can't duplicate this at all, are you sure it's coming from my tree?
> What is your .config here?

See above: that was an x86_64 allmodconfig build.  You need
CONFIG_USB_GADGET_DEBUG_FILES set.

The patch above was not in your usb quilt series when I fetched it
yesterday and it was there this morning.  The relevant hunk of the patch
looks like this:

@@ -1160,42 +1158,40 @@ int rndis_init(void)
 #ifdef	CONFIG_USB_GADGET_DEBUG_FILES
 		char name [20];
 
-		sprintf (name, NAME_TEMPLATE, i);
-		if (!(rndis_connect_state [i]
-				= proc_create_data(name, 0660, NULL,
+		sprintf(name, NAME_TEMPLATE, i);
+		rndis_connect_state[i] = proc_create_data(name, 0660, NULL,
 					&rndis_proc_fops,
-					(void *)(rndis_per_dev_params + i))))
-		{
-			pr_debug("%s :remove entries", __func__);
+					(void *)(rndis_per_dev_params + i))
                                                                           ^
*** note missing semicolon ...

+		if (!rndis_connect_state[i]) {
+			pr_debug("%s: remove entries", __func__);
 			while (i) {
-				sprintf (name, NAME_TEMPLATE, --i);
-				remove_proc_entry (name, NULL);
+				sprintf(name, NAME_TEMPLATE, --i);
+				remove_proc_entry(name, NULL);
 			}
 			pr_debug("\n");
 			return -EIO;

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature