V4L/DVB (7849): cx88: fix Kconfig depencencies for FW_LOADER

[linux-2.6] / drivers / firewire / fw-card.c

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 140b34d477de4d580f01501bdfd7764c3cd4ff12..5b4c0d9f517346ec79a1426a4d7982ebe07986c8 100644 (file)
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -167,7 +167,6 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
 
        return 0;
 }
-EXPORT_SYMBOL(fw_core_add_descriptor);
 
 void
 fw_core_remove_descriptor(struct fw_descriptor *desc)
@@ -182,7 +181,6 @@ fw_core_remove_descriptor(struct fw_descriptor *desc)
 
        mutex_unlock(&card_mutex);
 }
-EXPORT_SYMBOL(fw_core_remove_descriptor);
 
 static const char gap_count_table[] = {
        63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
@@ -220,7 +218,7 @@ fw_card_bm_work(struct work_struct *work)
        struct bm_data bmd;
        unsigned long flags;
        int root_id, new_root_id, irm_id, gap_count, generation, grace;
-       int do_reset = 0;
+       bool do_reset = false;
 
        spin_lock_irqsave(&card->lock, flags);
        local_node = card->local_node;
@@ -331,7 +329,7 @@ fw_card_bm_work(struct work_struct *work)
                 */
                spin_unlock_irqrestore(&card->lock, flags);
                goto out;
-       } else if (root_device->config_rom[2] & BIB_CMC) {
+       } else if (root_device->cmc) {
                /*
                 * FIXME: I suppose we should set the cmstr bit in the
                 * STATE_CLEAR register of this node, as described in
@@ -360,14 +358,14 @@ fw_card_bm_work(struct work_struct *work)
                gap_count = 63;
 
        /*
-        * Finally, figure out if we should do a reset or not.  If we've
-        * done less that 5 resets with the same physical topology and we
+        * Finally, figure out if we should do a reset or not.  If we have
+        * done less than 5 resets with the same physical topology and we
         * have either a new root or a new gap count setting, let's do it.
         */
 
        if (card->bm_retries++ < 5 &&
            (card->gap_count != gap_count || new_root_id != root_id))
-               do_reset = 1;
+               do_reset = true;
 
        spin_unlock_irqrestore(&card->lock, flags);