commit 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9
author Jeff Garzik <jeff@garzik.org> Thu Oct 05 21:03:43 2006 -0400
committer Jeff Garzik <jeff@garzik.org> Thu Oct 05 21:03:43 2006 -0400
tree d0536e4da737900fa27b235f175a3d179d692200
parent 46767aeba58ca9357a2309765201bad38d8f5e9b
parent 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3

Merge branch 'master' into upstream-fixes

drivers/ata/libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 77138a3..83728a9 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -870,7 +870,11 @@
 		 * the PIO timing number for the maximum. Turn it into
 		 * a mask.
 		 */
-		pio_mask = (2 << (id[ATA_ID_OLD_PIO_MODES] & 0xFF)) - 1 ;
+		u8 mode = id[ATA_ID_OLD_PIO_MODES] & 0xFF;
+		if (mode < 5)	/* Valid PIO range */
+                	pio_mask = (2 << mode) - 1;
+		else
+			pio_mask = 1;
 
 		/* But wait.. there's more. Design your standards by
 		 * committee and you too can get a free iordy field to