Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e5fa4b2968ff0f32b5ecfa082fd6db50b731055e
Commit:     e5fa4b2968ff0f32b5ecfa082fd6db50b731055e
Parent:     7dd00083b1160b560fa2a0a486799b57baa5d035
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 01:11:57 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 01:11:57 2007 +0200

    ide: ide_find_best_pio_mode() fixes (take 2)
    
    * Check IORDY bit for PIO modes > 2.
    
    * Some devices claim maximum PIO mode > 2 in id->tPIO, they were punished 
too
      severly for this by being limited to PIO_SLOW.  Limit them to PIO2 
instead.
    
    v2:
    * Fix PIO number being returned incorrectly instead of PIO mode
      (Noticed by Sergei).
    
    Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/ide-timing.h |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h
index e6cb859..9b5afeb 100644
--- a/drivers/ide/ide-timing.h
+++ b/drivers/ide/ide-timing.h
@@ -111,16 +111,14 @@ static short ide_find_best_pio_mode(ide_drive_t *drive)
        struct hd_driveid *id = drive->id;
        short best = 0;
 
-       if (id->field_valid & 2) {      /* EIDE PIO modes */
-
+       /* EIDE PIO modes */
+       if ((id->field_valid & 2) && (id->capability & 8)) {
                if ((best = (drive->id->eide_pio_modes & 4) ? XFER_PIO_5 :
                            (drive->id->eide_pio_modes & 2) ? XFER_PIO_4 :
                            (drive->id->eide_pio_modes & 1) ? XFER_PIO_3 : 0)) 
return best;
        }
-       
-       return  (drive->id->tPIO == 2) ? XFER_PIO_2 :
-               (drive->id->tPIO == 1) ? XFER_PIO_1 :
-               (drive->id->tPIO == 0) ? XFER_PIO_0 : XFER_PIO_SLOW;
+
+       return XFER_PIO_0 + min_t(u8, id->tPIO, 2);
 }
 
 static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, 
int T, int UT)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to