aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index f5d0ba8e22d5..d919e96c0afd 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -489,7 +489,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
489 pccard_io_map iomap; 489 pccard_io_map iomap;
490 490
491 if (!(s->state & SOCKET_PRESENT)) 491 if (!(s->state & SOCKET_PRESENT))
492 return -ENODEV;; 492 return -ENODEV;
493 493
494 if (req->IntType & INT_CARDBUS) { 494 if (req->IntType & INT_CARDBUS) {
495 ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n"); 495 ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n");
@@ -902,7 +902,7 @@ struct pcmcia_cfg_mem {
902 * 902 *
903 * pcmcia_loop_config() loops over all configuration options, and calls 903 * pcmcia_loop_config() loops over all configuration options, and calls
904 * the driver-specific conf_check() for each one, checking whether 904 * the driver-specific conf_check() for each one, checking whether
905 * it is a valid one. 905 * it is a valid one. Returns 0 on success or errorcode otherwise.
906 */ 906 */
907int pcmcia_loop_config(struct pcmcia_device *p_dev, 907int pcmcia_loop_config(struct pcmcia_device *p_dev,
908 int (*conf_check) (struct pcmcia_device *p_dev, 908 int (*conf_check) (struct pcmcia_device *p_dev,
@@ -915,7 +915,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
915 struct pcmcia_cfg_mem *cfg_mem; 915 struct pcmcia_cfg_mem *cfg_mem;
916 916
917 tuple_t *tuple; 917 tuple_t *tuple;
918 int ret = -ENODEV; 918 int ret;
919 unsigned int vcc; 919 unsigned int vcc;
920 920
921 cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL); 921 cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);