diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 20:14:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 20:14:21 -0400 |
| commit | c44df7413fd711bca818111b94cbd7ce5f3600a9 (patch) | |
| tree | 143e2f6de71cd0cb5ac74e423d87fb950df7bf2f /drivers/pcmcia | |
| parent | 103a1d5c57fac3623613b130b104f5b03367b31c (diff) | |
| parent | 0e09c863dbb8b1816ebc106df1a1cae4c588ce0e (diff) | |
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, | |||
| 275 | destroy_cis_cache(s); | 275 | destroy_cis_cache(s); |
| 276 | } | 276 | } |
| 277 | s->cis_mem.res = NULL; | 277 | s->cis_mem.res = NULL; |
| 278 | if ((ret != 0) || (count == 0)) | 278 | if ((ret != 0) || (*count == 0)) |
| 279 | return 0; | 279 | return 0; |
| 280 | return 1; | 280 | return 1; |
| 281 | } | 281 | } |