1 files changed, 17 insertions, 8 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 79550908adcc..553488015e49 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2920,14 +2920,9 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd,
         args.done = done;
 
         switch(scsicmd[0]) {
-                /* no-op's, complete with success */
-                case SYNCHRONIZE_CACHE:
-                case REZERO_UNIT:
-                case SEEK_6:
-                case SEEK_10:
-                case TEST_UNIT_READY:
-                case FORMAT_UNIT:               /* FIXME: correct? */
-                        ata_scsi_rbuf_fill(&args, ata_scsiop_noop);
+                /* TODO: worth improving? */
+                case FORMAT_UNIT:
+                        ata_scsi_invalid_field(cmd, done);
                         break;
 
                 case INQUIRY:
@@ -2985,6 +2980,20 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd,
                         done(cmd);
                         break;
 
+                /* if we reach this, then writeback caching is disabled,
+                 * turning this into a no-op.
+                 */
+                case SYNCHRONIZE_CACHE:
+                        /* fall through */
+
+                /* no-op's, complete with success */
+                case REZERO_UNIT:
+                case SEEK_6:
+                case SEEK_10:
+                case TEST_UNIT_READY:
+                        ata_scsi_rbuf_fill(&args, ata_scsiop_noop);
+                        break;
+
                 case SEND_DIAGNOSTIC:
                         tmp8 = scsicmd[1] & ~(1 << 3);
                         if ((tmp8 == 0x4) && (!scsicmd[3]) && (!scsicmd[4]))