Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ide-cd: cleanup ide_cdrom_update_speed()

Browse Source 
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-01 23:09:20 +01:00
parent f18f960c5c
commit 481c8c6476
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ide/ide-cd.c
View File

@ -2416,19 +2416,20 @@ int ide_cdrom_get_capabilities(ide_drive_t *drive, struct atapi_capabilities_pag
static
void ide_cdrom_update_speed (ide_drive_t *drive, struct atapi_capabilities_page *cap)
{
u16 curspeed, maxspeed;
/* The ACER/AOpen 24X cdrom has the speed fields byte-swapped */
if (!drive->id->model[0] &&
!strncmp(drive->id->fw_rev, "241N", 4)) {
CDROM_STATE_FLAGS(drive)->current_speed =
(le16_to_cpu(cap->curspeed) + (176/2)) / 176;
CDROM_CONFIG_FLAGS(drive)->max_speed =
(le16_to_cpu(cap->maxspeed) + (176/2)) / 176;
curspeed = le16_to_cpu(cap->curspeed);
maxspeed = le16_to_cpu(cap->maxspeed);
} else {
CDROM_STATE_FLAGS(drive)->current_speed =
(be16_to_cpu(cap->curspeed) + (176/2)) / 176;
CDROM_CONFIG_FLAGS(drive)->max_speed =
(be16_to_cpu(cap->maxspeed) + (176/2)) / 176;
curspeed = be16_to_cpu(cap->curspeed);
maxspeed = be16_to_cpu(cap->maxspeed);
}
CDROM_STATE_FLAGS(drive)->current_speed = (curspeed + (176/2)) / 176;
CDROM_CONFIG_FLAGS(drive)->max_speed = (maxspeed + (176/2)) / 176;
}
static