Merge tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc

[firefly-linux-kernel-4.4.55.git] / drivers / firewire / core-card.c

diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index cc595eba7ba969833bc278167b6494706b77c339..57ea7f464178708576c5809886d50568e5c71dae 100644 (file)
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -421,8 +421,8 @@ static void bm_work(struct work_struct *work)
                         * root, and thus, IRM.
                         */
                        new_root_id = local_id;
-                       fw_notice(card, "%s, making local node (%02x) root\n",
-                                 "BM lock failed", new_root_id);
+                       fw_notice(card, "BM lock failed (%s), making local node (%02x) root\n",
+                                 fw_rcode_string(rcode), new_root_id);
                        goto pick_me;
                }
        } else if (card->bm_generation != generation) {
@@ -676,6 +676,7 @@ void fw_card_release(struct kref *kref)
 
        complete(&card->done);
 }
+EXPORT_SYMBOL_GPL(fw_card_release);
 
 void fw_core_remove_card(struct fw_card *card)
 {