mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
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 <[email protected]> Cc: Jens Axboe <[email protected]> [bart: add an extra parentheses for consistency with the rest of kernel code] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
This commit is contained in:
parent
fec6ed1d1f
commit
f20f258603
2 changed files with 7 additions and 2 deletions
|
|
@ -1661,7 +1661,9 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
|
|||
cdi->mask &= ~CDC_PLAY_AUDIO;
|
||||
|
||||
mechtype = buf[8 + 6] >> 5;
|
||||
if (mechtype == mechtype_caddy || mechtype == mechtype_popup)
|
||||
if (mechtype == mechtype_caddy ||
|
||||
mechtype == mechtype_popup ||
|
||||
(drive->atapi_flags & IDE_AFLAG_NO_AUTOCLOSE))
|
||||
cdi->mask |= CDC_CLOSE_TRAY;
|
||||
|
||||
if (cdi->sanyo_slot > 0) {
|
||||
|
|
@ -1859,6 +1861,7 @@ static const struct cd_list_entry ide_cd_quirks_list[] = {
|
|||
{ "MATSHITADVD-ROM SR-8176", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
|
||||
{ "MATSHITADVD-ROM SR-8174", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
|
||||
{ "Optiarc DVD RW AD-5200A", NULL, IDE_AFLAG_PLAY_AUDIO_OK },
|
||||
{ "Optiarc DVD RW AD-7543A", NULL, IDE_AFLAG_NO_AUTOCLOSE },
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue