Re: 2.6.17-rc1: collie -- oopsen in pccardd?

[Pavel Machek]

> On Thu, Apr 13, 2006 at 05:54:52PM +0100, Russell King wrote:
> > diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
> > --- a/drivers/pcmcia/pcmcia_resource.c
> > +++ b/drivers/pcmcia/pcmcia_resource.c
> > @@ -89,7 +88,7 @@ static int alloc_io_space(struct pcmcia_
> >         }
> >         if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) {
> >                 *base = s->io_offset | (*base & 0x0fff);
> > -               s->io[0].Attributes = attr;
> > +               s->io[0].res->flags = (s->io[0].res->flags & ~IORESOURCE_BITS) | (attr & IORESOURCE_BITS);
> >                 return 0;
> >         }
> >         /* Check for an already-allocated window that must conflict with
> > 
> > will probably be the culpret - which is from commit
> > c7d006935dfda9174187aa557e94a137ced10c30.
> > 
> > Static maps do not have IO resources, so s->io[].Attributes was not a
> > "duplicated" field in this case.  This part of this change needs
> > reverting.
> 
> Oh yes, mea culpa. However, we can simply remove setting res->flags here, as
> we never read it in this case anyways.

It fixes the problem for me.
									Pavel

-- 
Thanks, Sharp!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/