aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/core-card.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-04-11 11:38:47 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2012-04-17 16:56:53 -0400
commit3b00b008888a851499bc039e70d12002af00ec9c (patch)
tree30bfaea7652a76c8d451098cdf5c0cbb1807f4ef /drivers/firewire/core-card.c
parent7bdbff6762a573b911e4ee5715779d8ee6a62631 (diff)
firewire: core: log error in case of failed bus manager lock
If the lock access to the bus manager register fails, also log the actual error that caused it to fail. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/core-card.c')
-rw-r--r--drivers/firewire/core-card.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index cc595eba7ba9..2a03bb927616 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -421,8 +421,8 @@ static void bm_work(struct work_struct *work)
421 * root, and thus, IRM. 421 * root, and thus, IRM.
422 */ 422 */
423 new_root_id = local_id; 423 new_root_id = local_id;
424 fw_notice(card, "%s, making local node (%02x) root\n", 424 fw_notice(card, "BM lock failed (%s), making local node (%02x) root\n",
425 "BM lock failed", new_root_id); 425 fw_rcode_string(rcode), new_root_id);
426 goto pick_me; 426 goto pick_me;
427 } 427 }
428 } else if (card->bm_generation != generation) { 428 } else if (card->bm_generation != generation) {