The patch titled
pcmcia: fix ioctl GET_CONFIGURATION_INFO for pcmcia_cards
has been added to the -mm tree. Its filename is
pcmcia-fix-ioctl-get_configuration_info-for-pcmcia_cards.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pcmcia: fix ioctl GET_CONFIGURATION_INFO for pcmcia_cards
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>
Values displayed when by cardctl config are horribly wrong for 16bit cards.
this fixes it up by not using memcpy() since source and target struct are
very different.
Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pcmcia/pcmcia_resource.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff -puN drivers/pcmcia/pcmcia_resource.c~pcmcia-fix-ioctl-get_configuration_info-for-pcmcia_cards drivers/pcmcia/pcmcia_resource.c
--- a/drivers/pcmcia/pcmcia_resource.c~pcmcia-fix-ioctl-get_configuration_info-for-pcmcia_cards
+++ a/drivers/pcmcia/pcmcia_resource.c
@@ -245,10 +245,17 @@ int pccard_get_configuration_info(struct
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;
_
Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are
pcmcia-fix-ioctl-for-get_status-and-get_configuration_info.patch
pcmcia-fix-ioctl-get_configuration_info-for-pcmcia_cards.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
