diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5e4f10d2806523e9ee5538938c2f7ff2e7e675f1..4a57ffecc7e616fd2bcc4a7897996994deec1543 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1276,7 +1276,8 @@ static int sd_init_command(struct scsi_cmnd *cmd)
 	case REQ_OP_ZONE_RESET:
 		return sd_zbc_setup_reset_cmnd(cmd);
 	default:
-		BUG();
+		WARN_ON_ONCE(1);
+		return BLKPREP_KILL;
 	}
 }