Index: sys/cam/mmc/mmc_da.c
===================================================================
--- sys/cam/mmc/mmc_da.c
+++ sys/cam/mmc/mmc_da.c
@@ -238,8 +238,7 @@
 mmc_handle_reply(union ccb *ccb)
 {
 
-	if (ccb->ccb_h.func_code != XPT_MMC_IO)
-		panic("__func__: don't know how to handle non-XPT_MMC_IO errors");
+	KASSERT(ccb->ccb_h.func_code == XPT_MMC_IO, ("cannot handle non-XPT_MMC_IO errors"));
 
 	/* TODO: maybe put MMC-specific handling into cam.c/cam_error_print altogether */
 	if (((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)) {
@@ -824,7 +823,7 @@
 	if (err != 0)
 		return (err);
 	if (!(ccb->mmcio.cmd.resp[0] & R1_APP_CMD))
-		return (MMC_ERR_FAILED);
+		return (EIO);
 
 	/* Now exec actual command */
 	int flags = 0;