diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:14:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:14:21 -0700 |
| commit | c44df7413fd711bca818111b94cbd7ce5f3600a9 (patch) | |
| tree | 143e2f6de71cd0cb5ac74e423d87fb950df7bf2f /drivers/pcmcia | |
| parent | 103a1d5c57fac3623613b130b104f5b03367b31c (diff) | |
| parent | 0e09c863dbb8b1816ebc106df1a1cae4c588ce0e (diff) | |
| download | linux-c44df7413fd711bca818111b94cbd7ce5f3600a9.tar.gz linux-c44df7413fd711bca818111b94cbd7ce5f3600a9.tar.bz2 linux-c44df7413fd711bca818111b94cbd7ce5f3600a9.zip | |
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
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index d0c1d63d1891..203e579ebbd2 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -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; } |