| commit | 152af05cc85119d294b977ab4de07a781795c298 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Mon Nov 05 09:16:38 2007 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Mon Nov 05 09:16:38 2007 -0500 |
| tree | cfbe22a936095883b71d313dbaee26db5a0f5b71 | |
| parent | 17bd9a2f4c35de29d2539a2ff6851d61be281e25 [diff] | |
| parent | f5456b63ec9fdad37b680fc9fe6fe8222d2c1839 [diff] |
Merge branch 'dipm-fix' into upstream-fixes
diff --git a/include/linux/ata.h b/include/linux/ata.h index 61535e7..304825b 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h
@@ -425,6 +425,8 @@ { if ((id[83] & 0xC000) != 0x4000) return 0; + if (!ata_id_u64(id, 100)) + return 0; return id[83] & (1 << 10); }