diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/pcmcia | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
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 | } |