Linus,

there's a small PCMCIA bugfix available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6.git

Please pull from that location. The diffstat and list of changes follows,
the individual diffs is also attached below

Thanks,
Dominik

Dominik Brodowski (1):
pcmcia: rsrc_nonstatic: check value, not pointer

drivers/pcmcia/rsrc_nonstatic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

---

From: Dominik Brodowski
Date: Mon, 28 Jul 2008 16:37:10 +0200
Subject: [PATCH 01/17] pcmcia: rsrc_nonstatic: check value, not pointer

Bug found by Harvey Harrison and Stephen Rothwell.

Signed-off-by: Dominik Brodowski
---
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 d0c1d63..203e579 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;
}
--
1.5.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/