Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f20f2586 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBorislav 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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fec6ed1d

drivers/ide/ide-cd.c

+4 −1
Original line number Diff line number Diff line
@@ -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 }

};

include/linux/ide.h

+3 −1
Original line number Diff line number Diff line
@@ -366,7 +366,9 @@ enum { 
	/* Currently on a filemark */

	IDE_AFLAG_FILEMARK		= (1 << 25),

	/* 0 = no tape is loaded, so we don't rewind after ejecting */

	IDE_AFLAG_MEDIUM_PRESENT	= (1 << 26)

	IDE_AFLAG_MEDIUM_PRESENT	= (1 << 26),



	IDE_AFLAG_NO_AUTOCLOSE		= (1 << 27),

};



struct ide_drive_s {