Commit 85283764 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/gregkh/linux/fix-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 2436e282 09b9f933
...@@ -2160,7 +2160,7 @@ static int cdrom_eject(ide_drive_t *drive, int ejectflag, ...@@ -2160,7 +2160,7 @@ static int cdrom_eject(ide_drive_t *drive, int ejectflag,
struct request_sense *sense) struct request_sense *sense)
{ {
struct request req; struct request req;
char loej = 0; char loej = 0x02;
if (CDROM_CONFIG_FLAGS(drive)->no_eject && !ejectflag) if (CDROM_CONFIG_FLAGS(drive)->no_eject && !ejectflag)
return -EDRIVE_CANT_DO_THIS; return -EDRIVE_CANT_DO_THIS;
...@@ -2172,8 +2172,8 @@ static int cdrom_eject(ide_drive_t *drive, int ejectflag, ...@@ -2172,8 +2172,8 @@ static int cdrom_eject(ide_drive_t *drive, int ejectflag,
cdrom_prepare_request(&req); cdrom_prepare_request(&req);
/* only tell drive to close tray if open, if it can do that */ /* only tell drive to close tray if open, if it can do that */
if (ejectflag && CDROM_CONFIG_FLAGS(drive)->close_tray) if (ejectflag && !CDROM_CONFIG_FLAGS(drive)->close_tray)
loej = 0x02; loej = 0;
req.sense = sense; req.sense = sense;
req.cmd[0] = GPCMD_START_STOP_UNIT; req.cmd[0] = GPCMD_START_STOP_UNIT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment