diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 335322f40c5a..548864510ba9 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -283,13 +283,13 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id) | |||
283 | * identify command to be sure of reply | 283 | * identify command to be sure of reply |
284 | */ | 284 | */ |
285 | if (cmd == ATA_CMD_ID_ATAPI) { | 285 | if (cmd == ATA_CMD_ID_ATAPI) { |
286 | ide_task_t task; | 286 | struct ide_cmd cmd; |
287 | 287 | ||
288 | memset(&task, 0, sizeof(task)); | 288 | memset(&cmd, 0, sizeof(cmd)); |
289 | /* disable DMA & overlap */ | 289 | /* disable DMA & overlap */ |
290 | task.tf_flags = IDE_TFLAG_OUT_FEATURE; | 290 | cmd.tf_flags = IDE_TFLAG_OUT_FEATURE; |
291 | 291 | ||
292 | tp_ops->tf_load(drive, &task); | 292 | tp_ops->tf_load(drive, &cmd); |
293 | } | 293 | } |
294 | 294 | ||
295 | /* ask drive for ID */ | 295 | /* ask drive for ID */ |
@@ -337,14 +337,14 @@ int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus) | |||
337 | 337 | ||
338 | static u8 ide_read_device(ide_drive_t *drive) | 338 | static u8 ide_read_device(ide_drive_t *drive) |
339 | { | 339 | { |
340 | ide_task_t task; | 340 | struct ide_cmd cmd; |
341 | 341 | ||
342 | memset(&task, 0, sizeof(task)); | 342 | memset(&cmd, 0, sizeof(cmd)); |
343 | task.tf_flags = IDE_TFLAG_IN_DEVICE; | 343 | cmd.tf_flags = IDE_TFLAG_IN_DEVICE; |
344 | 344 | ||
345 | drive->hwif->tp_ops->tf_read(drive, &task); | 345 | drive->hwif->tp_ops->tf_read(drive, &cmd); |
346 | 346 | ||
347 | return task.tf.device; | 347 | return cmd.tf.device; |
348 | } | 348 | } |
349 | 349 | ||
350 | /** | 350 | /** |