commit 53efec9513cfb1acff602c7ebdd945d677808e9e
author Dominik Brodowski <linux@dominikbrodowski.net> Mon Jul 28 19:44:05 2008 +0200
committer Dominik Brodowski <linux@dominikbrodowski.net> Sat Aug 02 18:56:49 2008 +0200
tree 6bf9d0475d0be0829348096442d505001c027017
parent 6e86841d05f371b5b9b86ce76c02aaee83352298

pcmcia: only copy CIS override data once

Instead of copying CIS override data in socket_sysfs.c or ds.c, and then again
in cistpl.c, only do so once. Also, cisdump_t is now only used by the
deprecated ioctl.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

drivers/pcmcia/pcmcia_ioctl.c

diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 419f97f..6c086ff 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -867,7 +867,7 @@
 			   &buf->win_info.map);
 	break;
     case DS_REPLACE_CIS:
-	ret = pcmcia_replace_cis(s, &buf->cisdump);
+	ret = pcmcia_replace_cis(s, buf->cisdump.Data, buf->cisdump.Length);
 	break;
     case DS_BIND_REQUEST:
 	if (!capable(CAP_SYS_ADMIN)) {