diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:49:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:49:10 -0800 |
commit | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (patch) | |
tree | 89505069cd4f46253c649bcd418a9e3cd26fc55f | |
parent | 7a62b17694e278b1cde659f85aa6149052baa811 (diff) | |
parent | 25a41b280083259d05d68f61633194344a1f8a9f (diff) | |
download | linux-3.10-1bda71282ded6a2e09a2db7c8884542fb46bfd4f.tar.gz linux-3.10-1bda71282ded6a2e09a2db7c8884542fb46bfd4f.tar.bz2 linux-3.10-1bda71282ded6a2e09a2db7c8884542fb46bfd4f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: add quirk fix for Freecom HDD
-rw-r--r-- | drivers/ieee1394/nodemgr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index d333ae22459..79ef5fd928a 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length, return error; } +#define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db + static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci) { + /* Freecom FireWire Hard Drive firmware bug */ + if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH) + return 0; + return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3; } |