ide: add ide_for_each_present_dev() iterator

[deliverable/linux.git] / drivers / ide / ide-iops.c

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b1892bd95c6fe5e7d270e3b92e2fd825b6847cb3..02fed32a4047966e5c5db4fa6bd05619fa374d0f 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1103,9 +1103,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
 
                prepare_to_wait(&ide_park_wq, &wait, TASK_UNINTERRUPTIBLE);
                timeout = jiffies;
-               ide_port_for_each_dev(i, tdrive, hwif) {
-                       if (tdrive->dev_flags & IDE_DFLAG_PRESENT &&
-                           tdrive->dev_flags & IDE_DFLAG_PARKED &&
+               ide_port_for_each_present_dev(i, tdrive, hwif) {
+                       if ((tdrive->dev_flags & IDE_DFLAG_PARKED) &&
                            time_after(tdrive->sleep, timeout))
                                timeout = tdrive->sleep;
                }