[ added linux-ide@ to cc: ] On Saturday 27 September 2008, Borislav Petkov wrote: > > so just a minor nitpicks and I could have applied it now > > (since I see in bugzilla that it has been successfully tested) > > except that it completely lacks the patch description... > > Here we go: > > --- > From: Borislav Petkov <petkovbb@xxxxxxxxx> > Date: Thu, 25 Sep 2008 07:57:07 +0200 > Subject: [PATCH] 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@xxxxxxxxx> applied, thanks! > --- > drivers/ide/ide-cd.c | 5 ++++- > include/linux/ide.h | 3 ++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c > index 49a8c58..a3198f6 100644 > --- a/drivers/ide/ide-cd.c > +++ b/drivers/ide/ide-cd.c > @@ -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) I added an extra parentheses for consistency with the rest of kernel code > 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 } > }; > > diff --git a/include/linux/ide.h b/include/linux/ide.h > index 1524829..d0c73f7 100644 > --- a/include/linux/ide.h > +++ b/include/linux/ide.h > @@ -366,7 +366,8 @@ 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 { -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
