From 23501674518a8954051b2bab17483baf2f2927c9 Mon Sep 17 00:00:00 2001 From: sos Date: Mon, 19 Nov 2007 21:11:26 +0000 Subject: Dont fumble the ivars on reinit, avoids panic on suspend/resume om some systems that looses thier devices. Patch by: jhb@ --- sys/dev/ata/atapi-cd.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'sys/dev/ata/atapi-cd.c') diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 22caf9b..df63fe1 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -157,12 +157,9 @@ acd_reinit(device_t dev) { 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); -- cgit v1.1