[PATCH 15/23] pcmcia: simplify pccard_validate_cis

[Dominik Brodowski]

Hi,

On Mon, Jul 14, 2008 at 10:39:23AM -0500, Larry Finger wrote:
> Dominik Brodowski wrote:
> > As cisinfo_t only contains one unsigned_int, pccard_validate_cis can
> > be simplified by passing that around directly.
> > 
> > Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
> 
> The following hunk breaks ide-cs for me.
> 
> > diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
> > index 3637953..0996ca2 100644
> > --- a/drivers/pcmcia/cistpl.c
> > +++ b/drivers/pcmcia/cistpl.c
> > @@ -1490,11 +1491,13 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_
> >  	    ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
> >  	    reserved++;
> >      }
> > -    if ((info->Chains == MAX_TUPLES) || (reserved > 5) ||
> > -	((!dev_ok || !ident_ok) && (info->Chains > 10)))
> > -	info->Chains = 0;
> > +    if ((count) || (reserved > 5) ||
>              ^^^^^
> If this is 'count == MAX_TUPLES' rather than 'count', then it works.

*doh* Bugfix is in the queue now.

Thanks,
	Dominik