Skip to content

Commit

Permalink
[PATCH] pcmcia: validate_mem fix
Browse files Browse the repository at this point in the history
Also return a value if CONFIG_PCMCIA_PROBE is not set.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Andrew Morton authored and Dominik Brodowski committed Jan 5, 2006
1 parent de75914 commit 2cff944
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/pcmcia/rsrc_nonstatic.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,15 +467,19 @@ static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)

#else /* CONFIG_PCMCIA_PROBE */

static void validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
{
struct resource_map *m, mm;
struct socket_data *s_data = s->resource_data;
unsigned long ok = 0;

for (m = s_data->mem_db.next; m != &s_data->mem_db; m = mm.next) {
mm = *m;
do_mem_probe(mm.base, mm.num, s);
ok += do_mem_probe(mm.base, mm.num, s);
}
if (ok > 0)
return 0;
return -ENODEV;
}

#endif /* CONFIG_PCMCIA_PROBE */
Expand Down

0 comments on commit 2cff944

Please sign in to comment.