8 files changed, 12 insertions, 11 deletions

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 2cc7b3266eaf..b881a9cd8741 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -618,7 +618,7 @@ static int dtl1_config(struct pcmcia_device *link)
 
         /* Look for a generic full-sized window */
         link->io.NumPorts1 = 8;
-        if (!pcmcia_loop_config(link, dtl1_confcheck, NULL))
+        if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)
                 goto failed;
 
         i = pcmcia_request_irq(link, &link->irq);
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c
index d6b4bd1db7d7..b1984ed72d1d 100644
--- a/drivers/pcmcia/au1000_pb1x00.c
+++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -26,7 +26,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
-#include <linux/tqueue.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/pcmcia/au1000_xxs1500.c b/drivers/pcmcia/au1000_xxs1500.c
index 9627390835ca..b43d47b50819 100644
--- a/drivers/pcmcia/au1000_xxs1500.c
+++ b/drivers/pcmcia/au1000_xxs1500.c
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
-#include <linux/tqueue.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 304ff6d5cf3b..9f300d3cb125 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -236,7 +236,6 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
         if (!dynid)
                 return -ENOMEM;
 
-        INIT_LIST_HEAD(&dynid->node);
         dynid->id.match_flags = match_flags;
         dynid->id.manf_id = manf_id;
         dynid->id.card_id = card_id;
@@ -246,7 +245,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
         memcpy(dynid->id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);
 
         spin_lock(&pdrv->dynids.lock);
-        list_add_tail(&pdrv->dynids.list, &dynid->node);
+        list_add_tail(&dynid->node, &pdrv->dynids.list);
         spin_unlock(&pdrv->dynids.lock);
 
         if (get_driver(&pdrv->drv)) {
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h
index 5554015a7813..72188c462c9c 100644
--- a/drivers/pcmcia/o2micro.h
+++ b/drivers/pcmcia/o2micro.h
@@ -48,6 +48,9 @@
 #ifndef PCI_DEVICE_ID_O2_6812
 #define PCI_DEVICE_ID_O2_6812           0x6872
 #endif
+#ifndef PCI_DEVICE_ID_O2_6933
+#define PCI_DEVICE_ID_O2_6933           0x6933
+#endif
 
 /* Additional PCI configuration registers */
 
@@ -154,6 +157,7 @@ static int o2micro_override(struct yenta_socket *socket)
                 case PCI_DEVICE_ID_O2_6812:
                 case PCI_DEVICE_ID_O2_6832:
                 case PCI_DEVICE_ID_O2_6836:
+                case PCI_DEVICE_ID_O2_6933:
                         dev_printk(KERN_INFO, &socket->dev->dev,
                                    "Yenta O2: old bridge, disabling read "
                                    "prefetch/write burst\n");
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 6095f8daecd7..7b424e0b0449 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -286,7 +286,7 @@ static int pccard_get_status(struct pcmcia_socket *s,
         return 0;
 } /* pccard_get_status */
 
-int pccard_get_configuration_info(struct pcmcia_socket *s,
+static int pccard_get_configuration_info(struct pcmcia_socket *s,
                                   struct pcmcia_device *p_dev,
                                   config_info_t *config)
 {
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,
         pccard_io_map iomap;
 
         if (!(s->state & SOCKET_PRESENT))
-                return -ENODEV;;
+                return -ENODEV;
 
         if (req->IntType & INT_CARDBUS) {
                 ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n");
@@ -902,7 +902,7 @@ struct pcmcia_cfg_mem {
  *
  * pcmcia_loop_config() loops over all configuration options, and calls
  * the driver-specific conf_check() for each one, checking whether
- * it is a valid one.
+ * it is a valid one. Returns 0 on success or errorcode otherwise.
  */
 int pcmcia_loop_config(struct pcmcia_device *p_dev,
                        int      (*conf_check)   (struct pcmcia_device *p_dev,
@@ -915,7 +915,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
         struct pcmcia_cfg_mem *cfg_mem;
 
         tuple_t *tuple;
-        int ret = -ENODEV;
+        int ret;
         unsigned int vcc;
 
         cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 9b4ac9385f5d..9a3b49865173 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -90,14 +90,14 @@ typedef struct pccard_io_map {
         u_char  map;
         u_char  flags;
         u_short speed;
-        u_int   start, stop;
+        phys_addr_t start, stop;
 } pccard_io_map;
 
 typedef struct pccard_mem_map {
         u_char          map;
         u_char          flags;
         u_short         speed;
-        u_long          static_start;
+        phys_addr_t     static_start;
         u_int           card_start;
         struct resource *res;
 } pccard_mem_map;