Merge branch 'master' into for-linus

2 files changed, 26 insertions, 4 deletions

diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 7b637a7c0e66..707cfa9c547d 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -341,6 +341,15 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)
 }
 #endif /* CONFIG_TOSHIBA_FPCIB0 */
 
+static void tc35815_fixup(struct pci_dev *dev)
+{
+        /* This device may have PM registers but not they are not suported. */
+        if (dev->pm_cap) {
+                dev_info(&dev->dev, "PM disabled\n");
+                dev->pm_cap = 0;
+        }
+}
+
 static void final_fixup(struct pci_dev *dev)
 {
         unsigned char bist;
@@ -374,6 +383,10 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1,
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1,
         quirk_slc90e66_ide);
 #endif
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TOSHIBA_2,
+                        PCI_DEVICE_ID_TOSHIBA_TC35815_NWU, tc35815_fixup);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TOSHIBA_2,
+                        PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939, tc35815_fixup);
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
 DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
 
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index a205e2ba8e7b..c860810722c0 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -782,7 +782,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
                 return;
         iocled->mmioaddr = ioremap(baseaddr, 1);
         if (!iocled->mmioaddr)
-                return;
+                goto out_free;
         iocled->chip.get = txx9_iocled_get;
         iocled->chip.set = txx9_iocled_set;
         iocled->chip.direction_input = txx9_iocled_dir_in;
@@ -791,13 +791,13 @@ void __init txx9_iocled_init(unsigned long baseaddr,
         iocled->chip.base = basenum;
         iocled->chip.ngpio = num;
         if (gpiochip_add(&iocled->chip))
-                return;
+                goto out_unmap;
         if (basenum < 0)
                 basenum = iocled->chip.base;
 
         pdev = platform_device_alloc("leds-gpio", basenum);
         if (!pdev)
-                return;
+                goto out_gpio;
         iocled->pdata.num_leds = num;
         iocled->pdata.leds = iocled->leds;
         for (i = 0; i < num; i++) {
@@ -812,7 +812,16 @@ void __init txx9_iocled_init(unsigned long baseaddr,
         }
         pdev->dev.platform_data = &iocled->pdata;
         if (platform_device_add(pdev))
-                platform_device_put(pdev);
+                goto out_pdev;
+        return;
+out_pdev:
+        platform_device_put(pdev);
+out_gpio:
+        gpio_remove(&iocled->chip);
+out_unmap:
+        iounmap(iocled->mmioaddr);
+out_free:
+        kfree(iocled);
 }
 #else /* CONFIG_LEDS_GPIO */
 void __init txx9_iocled_init(unsigned long baseaddr,