Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cff9447 authored by Andrew Morton's avatar Andrew Morton Committed by Dominik Brodowski
Browse files

[PATCH] pcmcia: validate_mem fix 



Also return a value if CONFIG_PCMCIA_PROBE is not set.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent de75914e

drivers/pcmcia/rsrc_nonstatic.c

+6 −2
Original line number Diff line number Diff line
@@ -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 */