diff options
| author | Alan Cox <alan@linux.intel.com> | 2014-12-10 15:05:38 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-12 05:04:12 -0800 |
| commit | a6c6193a3662f6634ad7f797597081556a9db068 (patch) | |
| tree | ae58c9987c2db5ef88e65ceff6e197ceaebc0177 | |
| parent | c4277e9ea70431aea0fecebb8bb9a3fbc27d074e (diff) | |
| download | linux-a6c6193a3662f6634ad7f797597081556a9db068.tar.gz linux-a6c6193a3662f6634ad7f797597081556a9db068.tar.bz2 linux-a6c6193a3662f6634ad7f797597081556a9db068.zip | |
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: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 6 | ||||
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 7f1953f78b12..e86cd6b31773 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -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": diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index aa628ed0e9f4..df2cb70aef5b 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c @@ -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); |