Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit f20f258603ebc5da91e76884cf0c0d7ac9804b1c

Authored by Borislav Petkov
Committed by Bartlomiej Zolnierkiewicz
1 parent fec6ed1d1f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ide-cd: temporary tray close fix 

This one fixes http://bugzilla.kernel.org/show_bug.cgi?id=11602.

A more generic fix for drives which cannot autoclose tray will follow.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
[bart: add an extra parentheses for consistency with the rest of kernel code]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 2 changed files with 7 additions and 2 deletions Side-by-side Diff

drivers/ide/ide-cd.c
Diff comments   View file @ f20f258
... ... @@ -1661,7 +1661,9 @@
1661 1661 cdi->mask &= ~CDC_PLAY_AUDIO;
1662 1662  
1663 1663 mechtype = buf[8 + 6] >> 5;
1664   - if (mechtype == mechtype_caddy || mechtype == mechtype_popup)
  1664 + if (mechtype == mechtype_caddy ||
  1665 + mechtype == mechtype_popup ||
  1666 + (drive->atapi_flags & IDE_AFLAG_NO_AUTOCLOSE))
1665 1667 cdi->mask |= CDC_CLOSE_TRAY;
1666 1668  
1667 1669 if (cdi->sanyo_slot > 0) {
... ... @@ -1859,6 +1861,7 @@
1859 1861 { "MATSHITADVD-ROM SR-8176", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
1860 1862 { "MATSHITADVD-ROM SR-8174", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
1861 1863 { "Optiarc DVD RW AD-5200A", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
  1864 + { "Optiarc DVD RW AD-7543A", NULL, IDE_AFLAG_NO_AUTOCLOSE },
1862 1865 { NULL, NULL, 0 }
1863 1866 };
1864 1867  
... ... @@ -366,7 +366,9 @@
366 366 /* Currently on a filemark */
367 367 IDE_AFLAG_FILEMARK = (1 << 25),
368 368 /* 0 = no tape is loaded, so we don't rewind after ejecting */
369   - IDE_AFLAG_MEDIUM_PRESENT = (1 << 26)
  369 + IDE_AFLAG_MEDIUM_PRESENT = (1 << 26),
  370 +
  371 + IDE_AFLAG_NO_AUTOCLOSE = (1 << 27),
370 372 };
371 373  
372 374 struct ide_drive_s {