From b629e0366f30636a1750ca744ff1f208e0de52f9 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Thu, 11 Aug 2011 20:40:42 +0200 Subject: [PATCH] --- yaml --- r: 263000 b: refs/heads/master c: a01e836087881dd9d824417190994c9b2b0f1dbb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/ohci.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d4a15db65955..7477c0af3778 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c1176b6a28850703ea6e3a0f0c703f6d6c61cd3 +refs/heads/master: a01e836087881dd9d824417190994c9b2b0f1dbb diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 4f6d72f87f6f..ded0c9bf96f4 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -2178,8 +2178,13 @@ static int ohci_enable(struct fw_card *card, ohci_driver_name, ohci)) { fw_error("Failed to allocate interrupt %d.\n", dev->irq); pci_disable_msi(dev); - dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, - ohci->config_rom, ohci->config_rom_bus); + + if (config_rom) { + dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, + ohci->next_config_rom, + ohci->next_config_rom_bus); + ohci->next_config_rom = NULL; + } return -EIO; }