diff options
Diffstat (limited to 'drivers/ide/ide-proc.c')
-rw-r--r-- | drivers/ide/ide-proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 8af88bf0969b..f66c9c3f6fc6 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
@@ -105,7 +105,7 @@ static int proc_ide_read_identify | |||
105 | len = sprintf(page, "\n"); | 105 | len = sprintf(page, "\n"); |
106 | 106 | ||
107 | if (drive) { | 107 | if (drive) { |
108 | unsigned short *val = (unsigned short *) page; | 108 | __le16 *val = (__le16 *)page; |
109 | 109 | ||
110 | err = taskfile_lib_get_identify(drive, page); | 110 | err = taskfile_lib_get_identify(drive, page); |
111 | if (!err) { | 111 | if (!err) { |
@@ -113,7 +113,7 @@ static int proc_ide_read_identify | |||
113 | page = out; | 113 | page = out; |
114 | do { | 114 | do { |
115 | out += sprintf(out, "%04x%c", | 115 | out += sprintf(out, "%04x%c", |
116 | le16_to_cpu(*val), (++i & 7) ? ' ' : '\n'); | 116 | le16_to_cpup(val), (++i & 7) ? ' ' : '\n'); |
117 | val += 1; | 117 | val += 1; |
118 | } while (i < (SECTOR_WORDS * 2)); | 118 | } while (i < (SECTOR_WORDS * 2)); |
119 | len = out - page; | 119 | len = out - page; |
@@ -345,7 +345,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg) | |||
345 | ide_task_t task; | 345 | ide_task_t task; |
346 | int err; | 346 | int err; |
347 | 347 | ||
348 | if (arg < 0 || arg > 70) | 348 | if (arg < XFER_PIO_0 || arg > XFER_UDMA_6) |
349 | return -EINVAL; | 349 | return -EINVAL; |
350 | 350 | ||
351 | memset(&task, 0, sizeof(task)); | 351 | memset(&task, 0, sizeof(task)); |
@@ -357,7 +357,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg) | |||
357 | 357 | ||
358 | err = ide_no_data_taskfile(drive, &task); | 358 | err = ide_no_data_taskfile(drive, &task); |
359 | 359 | ||
360 | if (!err && arg) { | 360 | if (!err) { |
361 | ide_set_xfer_rate(drive, (u8) arg); | 361 | ide_set_xfer_rate(drive, (u8) arg); |
362 | ide_driveid_update(drive); | 362 | ide_driveid_update(drive); |
363 | } | 363 | } |