Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull tile update from Chris Metcalf:
 "The interesting bug fix is support for the upcoming "4.2" release of
  the Tilera hypervisor, which by default launches Linux at privilege
  level 2 instead of 1.  The fix lets new and old hypervisors and
  Linuxes interoperate more smoothly, so I've tagged it for
  stable@kernel.org so that older Linuxes will be able to boot under the
  newer hypervisor."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  usb: tilegx: fix memleak when create hcd fail
  arch/tile: remove inline marking of EXPORT_SYMBOL functions
  rtc: rtc-tile: add missing platform_device_unregister() when module exit
  tile: support new Tilera hypervisor

2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/usb/host/ehci-tilegx.c b/drivers/usb/host/ehci-tilegx.c
index 1d215cdb9dea..b083a350eea3 100644
--- a/drivers/usb/host/ehci-tilegx.c
+++ b/drivers/usb/host/ehci-tilegx.c
@@ -118,8 +118,10 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 
         hcd = usb_create_hcd(&ehci_tilegx_hc_driver, &pdev->dev,
                              dev_name(&pdev->dev));
-        if (!hcd)
-                return -ENOMEM;
+        if (!hcd) {
+          ret = -ENOMEM;
+          goto err_hcd;
+        }
 
         /*
          * We don't use rsrc_start to map in our registers, but seems like
@@ -176,6 +178,7 @@ err_have_irq:
 err_no_irq:
         tilegx_stop_ehc();
         usb_put_hcd(hcd);
+err_hcd:
         gxio_usb_host_destroy(&pdata->usb_ctx);
         return ret;
 }
diff --git a/drivers/usb/host/ohci-tilegx.c b/drivers/usb/host/ohci-tilegx.c
index 1ae7b28a71c2..ea73009de623 100644
--- a/drivers/usb/host/ohci-tilegx.c
+++ b/drivers/usb/host/ohci-tilegx.c
@@ -112,8 +112,10 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev)
 
         hcd = usb_create_hcd(&ohci_tilegx_hc_driver, &pdev->dev,
                              dev_name(&pdev->dev));
-        if (!hcd)
-                return -ENOMEM;
+        if (!hcd) {
+                ret = -ENOMEM;
+                goto err_hcd;
+        }
 
         /*
          * We don't use rsrc_start to map in our registers, but seems like
@@ -165,6 +167,7 @@ err_have_irq:
 err_no_irq:
         tilegx_stop_ohc();
         usb_put_hcd(hcd);
+err_hcd:
         gxio_usb_host_destroy(&pdata->usb_ctx);
         return ret;
 }