]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:40:49 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:40:49 +0000 (08:40 -0700)
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: ohci: fix DMA unmapping in an error path
  firewire: cdev: fix 32 bit userland on 64 bit kernel compat corner cases

1  2 
drivers/firewire/ohci.c

diff --combined drivers/firewire/ohci.c
index bcf792fac442576181f00596a018cf22a0dd67aa,ded0c9bf96f44cf62216d4ef4e76c06ac15e24f5..57cd3a406edf3930954a2c18938ab8e4796ffa16
@@@ -263,7 -263,6 +263,7 @@@ static char ohci_driver_name[] = KBUILD
  #define PCI_DEVICE_ID_AGERE_FW643     0x5901
  #define PCI_DEVICE_ID_JMICRON_JMB38X_FW       0x2380
  #define PCI_DEVICE_ID_TI_TSB12LV22    0x8009
 +#define PCI_VENDOR_ID_PINNACLE_SYSTEMS        0x11bd
  
  #define QUIRK_CYCLE_TIMER             1
  #define QUIRK_RESET_PACKET            2
@@@ -2179,8 -2178,13 +2179,13 @@@ static int ohci_enable(struct fw_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;
        }
  
@@@ -3203,11 -3207,6 +3208,11 @@@ static int __devinit pci_probe(struct p
        int i, err;
        size_t size;
  
 +      if (dev->vendor == PCI_VENDOR_ID_PINNACLE_SYSTEMS) {
 +              dev_err(&dev->dev, "Pinnacle MovieBoard is not yet supported\n");
 +              return -ENOSYS;
 +      }
 +
        ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
        if (ohci == NULL) {
                err = -ENOMEM;