diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b36f44d..5a5639d 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1533,7 +1533,10 @@ void init_cdrom_command(struct packet_co
 		memset(buf, 0, len);
 	cgc->buffer = (char *) buf;
 	cgc->buflen = len;
-	cgc->data_direction = type;
+	if (len)
+		cgc->data_direction = type;
+	else
+		cgc->data_direction = CGC_DATA_NONE;
 	cgc->timeout = CDROM_DEF_TIMEOUT;
 }