aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/csr1212.c
diff options
context:
space:
mode:
authorAndrea Guzzo <xant@dyne.org>2006-12-07 18:53:24 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-02-08 14:55:02 -0500
commit0749aaab4975d741e124c139d40f00853a451f7f (patch)
treec3ab0e1be6bf36665728bc4068b00c5046db974d /drivers/ieee1394/csr1212.c
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
ieee1394: modified csr1212_key_id_type_map to support lisight
This patch applies a little change in csr1212.c to fix iSight (firewire digital camera) related issues (but maybe other firewire devices could also need such modification) The actual implementation of the "csr1212_key_id_type_map" table doesn't support some node types used by the iSight for the audio unit. This limit makes the csr scanning routine to never see the audio unit node , and consequently the iSight driver probe() routine to be never called and there is no way to hook an isight device when it is inserted. Signed-off-by: Andrea Guzzo <xant@xant.net> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/csr1212.c')
-rw-r--r--drivers/ieee1394/csr1212.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 586f71e7346a..889ea0dfe2db 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -47,14 +47,14 @@
47#define __D (1 << CSR1212_KV_TYPE_DIRECTORY) 47#define __D (1 << CSR1212_KV_TYPE_DIRECTORY)
48#define __L (1 << CSR1212_KV_TYPE_LEAF) 48#define __L (1 << CSR1212_KV_TYPE_LEAF)
49static const u_int8_t csr1212_key_id_type_map[0x30] = { 49static const u_int8_t csr1212_key_id_type_map[0x30] = {
50 0, /* Reserved */ 50 __C, /* used by Apple iSight */
51 __D | __L, /* Descriptor */ 51 __D | __L, /* Descriptor */
52 __I | __D | __L, /* Bus_Dependent_Info */ 52 __I | __D | __L, /* Bus_Dependent_Info */
53 __I | __D | __L, /* Vendor */ 53 __I | __D | __L, /* Vendor */
54 __I, /* Hardware_Version */ 54 __I, /* Hardware_Version */
55 0, 0, /* Reserved */ 55 0, 0, /* Reserved */
56 __D | __L, /* Module */ 56 __D | __L | __I, /* Module */
57 0, 0, 0, 0, /* Reserved */ 57 __I, 0, 0, 0, /* used by Apple iSight, Reserved */
58 __I, /* Node_Capabilities */ 58 __I, /* Node_Capabilities */
59 __L, /* EUI_64 */ 59 __L, /* EUI_64 */
60 0, 0, 0, /* Reserved */ 60 0, 0, 0, /* Reserved */