X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/7d3040d08ffa165c75ea33800ac3e2ba8b7eca48..e4c9c0c82658e0eca11c3e516c41021ba48b0093:/sys/bus/cam/scsi/scsi_cd.c

diff --git a/sys/bus/cam/scsi/scsi_cd.c b/sys/bus/cam/scsi/scsi_cd.c
index a117cf929e..1a073df5dd 100644
--- a/sys/bus/cam/scsi/scsi_cd.c
+++ b/sys/bus/cam/scsi/scsi_cd.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.31.2.16 2003/10/21 22:26:11 thomas Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.14 2004/05/13 23:49:11 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.15 2004/05/19 22:52:38 dillon Exp $
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
@@ -545,7 +545,7 @@ cdcleanup(struct cam_periph *periph)
 	}
 	devstat_remove_entry(&softc->device_stats);
 	cam_extend_release(cdperiphs, periph->unit_number);
-	if (softc->disk.d_dev) {
+	if (softc->disk.d_rawdev) {
 		disk_destroy(&softc->disk);
 	}
 	free(softc, M_DEVBUF);
@@ -2856,7 +2856,7 @@ cdcheckmedia(struct cam_periph *periph)
 			 * We don't bother checking the return value here,
 			 * since we already have an error...
 			 */
-			dsioctl(softc->disk.d_dev, DIOCSYNCSLICEINFO,
+			dsioctl(softc->disk.d_cdev, DIOCSYNCSLICEINFO,
 				/*data*/(caddr_t)&force, /*flags*/ 0,
 				&softc->disk.d_slice);
 		}
@@ -2887,7 +2887,7 @@ cdcheckmedia(struct cam_periph *periph)
 
 			force = 1;
 
-			error = dsioctl(softc->disk.d_dev, DIOCSYNCSLICEINFO,
+			error = dsioctl(softc->disk.d_cdev, DIOCSYNCSLICEINFO,
 					/*data*/(caddr_t)&force, /*flags*/ 0,
 					&softc->disk.d_slice);
 			if (error != 0) {