Commit a6c6193a authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

pcmcia: correct types 



We should be using resource_size_t and unsigned types correctly, otherwise
we sign extend the flags on a 64bit box, which is not what we want.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4277e9e

drivers/pcmcia/cs_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ struct pccard_resource_ops { 
 * Stuff internal to module "pcmcia_rsrc":

 */

extern int static_init(struct pcmcia_socket *s);

extern struct resource *pcmcia_make_resource(unsigned long start,

					unsigned long end,

					int flags, const char *name);

extern struct resource *pcmcia_make_resource(resource_size_t start,

					resource_size_t end,

					unsigned long flags, const char *name);



/*

 * Stuff internal to module "pcmcia_core":

drivers/pcmcia/rsrc_mgr.c

+3 −2
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ int static_init(struct pcmcia_socket *s) 
	return 0;

}



struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,

				int flags, const char *name)

struct resource *pcmcia_make_resource(resource_size_t start,

					resource_size_t end,

					unsigned long flags, const char *name)

{

	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE