git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
44aefd2
)
Merge branch 'master' into upstream-fixes
author
Jeff Garzik
<jeff@garzik.org>
Fri, 6 Oct 2006 01:03:43 +0000
(21:03 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Fri, 6 Oct 2006 01:03:43 +0000
(21:03 -0400)
drivers/ata/libata-core.c
patch
|
blob
|
history
diff --git
a/drivers/ata/libata-core.c
b/drivers/ata/libata-core.c
index 77138a39eb041d0c2b6a87db88b424bdb51abfd6..83728a9457ad896590e79fa44d55d9e6efedaf8f 100644
(file)
--- a/
drivers/ata/libata-core.c
+++ b/
drivers/ata/libata-core.c
@@
-870,7
+870,11
@@
static unsigned int ata_id_xfermask(const u16 *id)
* 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