Merge tag 'v2.6.39-rc7'

[pandora-kernel.git] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index ce767a4..f9f5570 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2208,7 +2208,6 @@ static int ohci_set_config_rom(struct fw_card *card,
 {
        struct fw_ohci *ohci;
        unsigned long flags;
 {
        struct fw_ohci *ohci;
        unsigned long flags;

-       int ret = -EBUSY;

        __be32 *next_config_rom;
        dma_addr_t uninitialized_var(next_config_rom_bus);
 
        __be32 *next_config_rom;
        dma_addr_t uninitialized_var(next_config_rom_bus);
 


@@ -2249,22 +2248,37 @@ static int ohci_set_config_rom(struct fw_card *card,
 
        spin_lock_irqsave(&ohci->lock, flags);
 
 
        spin_lock_irqsave(&ohci->lock, flags);
 

+       /*
+        * If there is not an already pending config_rom update,
+        * push our new allocation into the ohci->next_config_rom
+        * and then mark the local variable as null so that we
+        * won't deallocate the new buffer.
+        *
+        * OTOH, if there is a pending config_rom update, just
+        * use that buffer with the new config_rom data, and
+        * let this routine free the unused DMA allocation.
+        */
+

        if (ohci->next_config_rom == NULL) {
                ohci->next_config_rom = next_config_rom;
                ohci->next_config_rom_bus = next_config_rom_bus;
        if (ohci->next_config_rom == NULL) {
                ohci->next_config_rom = next_config_rom;
                ohci->next_config_rom_bus = next_config_rom_bus;

+               next_config_rom = NULL;
+       }

 
 

-               copy_config_rom(ohci->next_config_rom, config_rom, length);
+       copy_config_rom(ohci->next_config_rom, config_rom, length);

 
 

-               ohci->next_header = config_rom[0];
-               ohci->next_config_rom[0] = 0;
+       ohci->next_header = config_rom[0];
+       ohci->next_config_rom[0] = 0;

 
 

-               reg_write(ohci, OHCI1394_ConfigROMmap,
-                         ohci->next_config_rom_bus);
-               ret = 0;
-       }
+       reg_write(ohci, OHCI1394_ConfigROMmap, ohci->next_config_rom_bus);

 
        spin_unlock_irqrestore(&ohci->lock, flags);
 
 
        spin_unlock_irqrestore(&ohci->lock, flags);
 

+       /* If we didn't use the DMA allocation, delete it. */
+       if (next_config_rom != NULL)
+               dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                 next_config_rom, next_config_rom_bus);
+

        /*
         * Now initiate a bus reset to have the changes take
         * effect. We clean up the old config rom memory and DMA
        /*
         * Now initiate a bus reset to have the changes take
         * effect. We clean up the old config rom memory and DMA


@@ -2272,13 +2286,10 @@ static int ohci_set_config_rom(struct fw_card *card,
         * controller could need to access it before the bus reset
         * takes effect.
         */
         * controller could need to access it before the bus reset
         * takes effect.
         */

-       if (ret == 0)
-               fw_schedule_bus_reset(&ohci->card, true, true);
-       else
-               dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
-                                 next_config_rom, next_config_rom_bus);

 
 

-       return ret;
+       fw_schedule_bus_reset(&ohci->card, true, true);
+
+       return 0;

 }
 
 static void ohci_send_request(struct fw_card *card, struct fw_packet *packet)
 }
 
 static void ohci_send_request(struct fw_card *card, struct fw_packet *packet)