1 files changed, 5 insertions, 3 deletions

diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index edaa58a816e0c..5e01911a0988b 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -416,6 +416,9 @@ acdopen(dev_t dev, int32_t flags, int32_t fmt, struct proc *p)
 {
     struct acd_softc *cdp = dev->si_drv1;
 
+    if (!cdp)
+	return ENXIO;
+
     if (cdp->flags & F_WRITING)
 	return EBUSY;
 
@@ -1091,10 +1094,9 @@ acd_done(struct atapi_request *request)
 {
     struct buf *bp = request->bp;
     struct acd_softc *cdp = request->driver;
-    int32_t error = request->result;
     
-    if (error) {
-	bp->b_error = error;
+    if (request->error) {
+	bp->b_error = request->error;
 	bp->b_flags |= B_ERROR;
     }	
     else {