ieee1394: sbp2: use a better wildcard for blacklist

[linux-2.6] / drivers / ieee1394 / csr1212.c

diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 15773544234b496c7fd10645dae7bd6e0b5751ba..889ea0dfe2dba28a6c48af9239dff1f831c95ff6 100644 (file)
--- 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 */
@@ -779,7 +779,7 @@ static int csr1212_append_new_cache(struct csr1212_csr *csr, size_t romsize)
        romsize = (romsize + (csr->max_rom - 1)) & ~(csr->max_rom - 1);
 
        csr_addr = csr->ops->allocate_addr_range(romsize, csr->max_rom, csr->private);
-       if (csr_addr == ~0ULL) {
+       if (csr_addr == CSR1212_INVALID_ADDR_SPACE) {
                return CSR1212_ENOMEM;
        }
        if (csr_addr < CSR1212_REGISTER_SPACE_BASE) {