Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 16 insertions, 17 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 61cb4b29f55c..35f88649d3b7 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support"
 
 config PCCARD
         tristate "PCCard (PCMCIA/CardBus) support"
-        select HOTPLUG
+        depends on HOTPLUG
         ---help---
           Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
           computer.  These are credit-card size devices such as network cards,
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 738b1ef595a3..9ad18e62658d 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -601,12 +601,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
             ret = CS_BAD_ARGS;
         else {
             struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function);
-            if (p_dev == NULL)
-                    ret = CS_BAD_ARGS;
-            else {
-                    ret = pccard_get_configuration_info(s, p_dev, &buf->config);
-                    pcmcia_put_dev(p_dev);
-            }
+            ret = pccard_get_configuration_info(s, p_dev, &buf->config);
+            pcmcia_put_dev(p_dev);
         }
         break;
     case DS_GET_FIRST_TUPLE:
@@ -636,12 +632,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
                     ret = CS_BAD_ARGS;
             else {
                     struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function);
-                    if (p_dev == NULL)
-                            ret = CS_BAD_ARGS;
-                    else {
-                            ret = pccard_get_status(s, p_dev, &buf->status);
-                            pcmcia_put_dev(p_dev);
-                    }
+                    ret = pccard_get_status(s, p_dev, &buf->status);
+                    pcmcia_put_dev(p_dev);
             }
             break;
     case DS_VALIDATE_CIS:
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 7bf25b88ea31..c8323399e9e4 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -245,10 +245,17 @@ int pccard_get_configuration_info(struct pcmcia_socket *s,
                 return CS_SUCCESS;
         }
 
-        /* !!! This is a hack !!! */
-        memcpy(&config->Attributes, &c->Attributes, sizeof(config_t));
-        config->Attributes |= CONF_VALID_CLIENT;
-        config->CardValues = c->CardValues;
+        config->Attributes = c->Attributes | CONF_VALID_CLIENT;
+        config->Vcc = s->socket.Vcc;
+        config->Vpp1 = config->Vpp2 = s->socket.Vpp;
+        config->IntType = c->IntType;
+        config->ConfigBase = c->ConfigBase;
+        config->Status = c->Status;
+        config->Pin = c->Pin;
+        config->Copy = c->Copy;
+        config->Option = c->Option;
+        config->ExtStatus = c->ExtStatus;
+        config->Present = config->CardValues = c->CardValues;
         config->IRQAttributes = c->irq.Attributes;
         config->AssignedIRQ = s->irq.AssignedIRQ;
         config->BasePort1 = c->io.BasePort1;