X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fscsi%2Fsd_dif.c;h=184dff492797e960c2a65ae4fce5f81ead4c3654;hb=5db524bd469290212781e1cb0293b57a7a1c000a;hp=c9b41077fca174f41c716141a5d19e423c5139a8;hpb=becce74b8231f8b5e51165e797f6c950d1dbcf67;p=mv-sheeva.git

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index c9b41077fca..184dff49279 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -374,7 +374,10 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsig
 	else
 		csum_convert = 0;
 
+	BUG_ON(dif && (scmd->cmnd[0] == READ_6 || scmd->cmnd[0] == WRITE_6));
+
 	switch (scmd->cmnd[0]) {
+	case READ_6:
 	case READ_10:
 	case READ_12:
 	case READ_16:
@@ -390,6 +393,7 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsig
 
 		break;
 
+	case WRITE_6:
 	case WRITE_10:
 	case WRITE_12:
 	case WRITE_16: