]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ide-cd: reverse NOT_READY sense key logic
authorBorislav Petkov <petkovbb@googlemail.com>
Wed, 8 Apr 2009 12:13:03 +0000 (14:13 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 8 Apr 2009 12:13:03 +0000 (14:13 +0200)
Make the case of flushing the drive's cache explicit.

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-cd.c

index 3ce1eafef5e46d405edba7ea0fe0ff3c384ceaa6..3aec19d1fdfca2495be987b45437d359d5f09d2c 100644 (file)
@@ -341,15 +341,15 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
 
        switch (sense_key) {
        case NOT_READY:
-               if (blk_fs_request(rq) == 0 || rq_data_dir(rq) == READ) {
+               if (blk_fs_request(rq) && rq_data_dir(rq) == WRITE) {
+                       if (ide_cd_breathe(drive, rq))
+                               return 1;
+               } else {
                        cdrom_saw_media_change(drive);
 
                        if (blk_fs_request(rq) && !quiet)
                                printk(KERN_ERR PFX "%s: tray open\n",
                                        drive->name);
-               } else {
-                       if (ide_cd_breathe(drive, rq))
-                               return 1;
                }
                do_end_request = 1;
                break;