Index: atapi-cd.c
===================================================================
RCS file: /usr/cvs/src/sys/dev/ata/atapi-cd.c,v
retrieving revision 1.193
diff -u -r1.193 atapi-cd.c
--- atapi-cd.c	23 Feb 2007 16:25:08 -0000	1.193
+++ atapi-cd.c	31 May 2007 15:58:03 -0000
@@ -157,12 +157,9 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_device *atadev = device_get_softc(dev);
-    struct acd_softc *cdp = device_get_ivars(dev);
 
     if (((atadev->unit == ATA_MASTER) && !(ch->devices & ATA_ATAPI_MASTER)) ||
 	((atadev->unit == ATA_SLAVE) && !(ch->devices & ATA_ATAPI_SLAVE))) {
-	device_set_ivars(dev, NULL);
-	free(cdp, M_ACD);
 	return 1;   
     }
     ATA_SETMODE(device_get_parent(dev), dev);
Index: atapi-fd.c
===================================================================
RCS file: /usr/cvs/src/sys/dev/ata/atapi-fd.c,v
retrieving revision 1.110
diff -u -r1.110 atapi-fd.c
--- atapi-fd.c	21 Feb 2007 19:07:18 -0000	1.110
+++ atapi-fd.c	31 May 2007 15:57:56 -0000
@@ -149,12 +149,9 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_device *atadev = device_get_softc(dev);
-    struct afd_softc *fdp = device_get_ivars(dev);
     
     if (((atadev->unit == ATA_MASTER) && !(ch->devices & ATA_ATAPI_MASTER)) ||
 	((atadev->unit == ATA_SLAVE) && !(ch->devices & ATA_ATAPI_SLAVE))) {
-	device_set_ivars(dev, NULL);
-	free(fdp, M_AFD);
 	return 1;
     }
     ATA_SETMODE(device_get_parent(dev), dev);
Index: atapi-tape.c
===================================================================
RCS file: /usr/cvs/src/sys/dev/ata/atapi-tape.c,v
retrieving revision 1.103
diff -u -r1.103 atapi-tape.c
--- atapi-tape.c	23 Feb 2007 16:25:08 -0000	1.103
+++ atapi-tape.c	31 May 2007 15:57:18 -0000
@@ -195,12 +195,9 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_device *atadev = device_get_softc(dev);
-    struct ast_softc *stp = device_get_ivars(dev);
 
     if (((atadev->unit == ATA_MASTER) && !(ch->devices & ATA_ATAPI_MASTER)) ||
 	((atadev->unit == ATA_SLAVE) && !(ch->devices & ATA_ATAPI_SLAVE))) {
-	device_set_ivars(dev, NULL);
-	free(stp, M_AST);
 	return 1;
     }
     ATA_SETMODE(device_get_parent(dev), dev);