From 0749aaab4975d741e124c139d40f00853a451f7f Mon Sep 17 00:00:00 2001 From: Andrea Guzzo Date: Fri, 8 Dec 2006 00:53:24 +0100 Subject: 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 Signed-off-by: Stefan Richter --- drivers/ieee1394/csr1212.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/ieee1394/csr1212.c') 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 @@ #define __D (1 << CSR1212_KV_TYPE_DIRECTORY) #define __L (1 << CSR1212_KV_TYPE_LEAF) static const u_int8_t csr1212_key_id_type_map[0x30] = { - 0, /* Reserved */ + __C, /* used by Apple iSight */ __D | __L, /* Descriptor */ __I | __D | __L, /* Bus_Dependent_Info */ __I | __D | __L, /* Vendor */ __I, /* Hardware_Version */ 0, 0, /* Reserved */ - __D | __L, /* Module */ - 0, 0, 0, 0, /* Reserved */ + __D | __L | __I, /* Module */ + __I, 0, 0, 0, /* used by Apple iSight, Reserved */ __I, /* Node_Capabilities */ __L, /* EUI_64 */ 0, 0, 0, /* Reserved */ -- cgit v1.2.3