Re: pull request: wireless-2.6 2010-02-10

[Johannes Berg]

On Wed, 2010-02-10 at 11:07 -0800, David Miller wrote:
> From: "John W. Linville" <linville@xxxxxxxxxxxxx>
> Date: Wed, 10 Feb 2010 13:58:16 -0500
> 
> > Please let me know if there are problems!
> 
> I see one:
> 
> > diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> > index 5681ebe..03dfd27 100644
> > --- a/drivers/ssb/main.c
> > +++ b/drivers/ssb/main.c
> > @@ -494,8 +494,7 @@ static int ssb_devices_register(struct ssb_bus
> *bus)
> >  #endif
> >  			break;
> >  		case SSB_BUSTYPE_SDIO:
> > -#ifdef CONFIG_SSB_SDIO
> > -			sdev->irq = bus->host_sdio->dev.irq;
> > +#ifdef CONFIG_SSB_SDIOHOST
> >  			dev->parent = &bus->host_sdio->dev;
> >  #endif
> >  			break;
> 
> The commit message says "fix a typo" but it's also removing
> the assignment of sdev->irq
> 
> All the bus types assign the sdev->irq, so it looks like
> this was removed unintentionally.
> 
> If it was intentional, it needs to be explained in the
> commit message or a code comment.

It was intentional -- that sdev doesn't even have an irq member, but
nobody ever noticed because of the wrong ifdef.

johannes

Attachment: signature.asc
Description: This is a digitally signed message part