aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 92ac658dac33..249834b024f5 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2909,6 +2909,9 @@ static int ide_cdrom_register (ide_drive_t *drive, int nslots)
2909 if (!CDROM_CONFIG_FLAGS(drive)->ram) 2909 if (!CDROM_CONFIG_FLAGS(drive)->ram)
2910 devinfo->mask |= CDC_RAM; 2910 devinfo->mask |= CDC_RAM;
2911 2911
2912 if (CDROM_CONFIG_FLAGS(drive)->no_speed_select)
2913 devinfo->mask |= CDC_SELECT_SPEED;
2914
2912 devinfo->disk = info->disk; 2915 devinfo->disk = info->disk;
2913 return register_cdrom(devinfo); 2916 return register_cdrom(devinfo);
2914} 2917}
@@ -3161,7 +3164,7 @@ int ide_cdrom_setup (ide_drive_t *drive)
3161 CDROM_CONFIG_FLAGS(drive)->limit_nframes = 1; 3164 CDROM_CONFIG_FLAGS(drive)->limit_nframes = 1;
3162 /* the 3231 model does not support the SET_CD_SPEED command */ 3165 /* the 3231 model does not support the SET_CD_SPEED command */
3163 else if (!strcmp(drive->id->model, "SAMSUNG CD-ROM SCR-3231")) 3166 else if (!strcmp(drive->id->model, "SAMSUNG CD-ROM SCR-3231"))
3164 cdi->mask |= CDC_SELECT_SPEED; 3167 CDROM_CONFIG_FLAGS(drive)->no_speed_select = 1;
3165 3168
3166#if ! STANDARD_ATAPI 3169#if ! STANDARD_ATAPI
3167 /* by default Sanyo 3 CD changer support is turned off and 3170 /* by default Sanyo 3 CD changer support is turned off and