Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: pcmcia: rsrc_nonstatic: check value, not pointer
This commit is contained in:
commit
c44df7413f
|
@ -275,7 +275,7 @@ static int readable(struct pcmcia_socket *s, struct resource *res,
|
|||
destroy_cis_cache(s);
|
||||
}
|
||||
s->cis_mem.res = NULL;
|
||||
if ((ret != 0) || (count == 0))
|
||||
if ((ret != 0) || (*count == 0))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue