Skip to content

Commit

Permalink
ide-cd: cleanup ide_cdrom_update_speed()
Browse files Browse the repository at this point in the history 
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 1, 2008
1 parent f18f960 commit 481c8c6
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions drivers/ide/ide-cd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 481c8c6

Please sign in to comment.