diff --git a/[refs] b/[refs]
index dab7464cb9f7..212bfff26b76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e753345bec8fef81d1e87710917f89dc75f39b2a
+refs/heads/master: 72bb6f9b51c82c820ddef892455a85b115460904
diff --git a/trunk/arch/arm/plat-omap/omap_device.c b/trunk/arch/arm/plat-omap/omap_device.c
index 1d1b5ff78306..150112e3ffc8 100644
--- a/trunk/arch/arm/plat-omap/omap_device.c
+++ b/trunk/arch/arm/plat-omap/omap_device.c
@@ -756,6 +756,10 @@ static int _od_suspend_noirq(struct device *dev)
 	struct omap_device *od = to_omap_device(pdev);
 	int ret;
 
+	/* Don't attempt late suspend on a driver that is not bound */
+	if (od->_driver_status != BUS_NOTIFY_BOUND_DRIVER)
+		return 0;
+
 	ret = pm_generic_suspend_noirq(dev);
 
 	if (!ret && !pm_runtime_status_suspended(dev)) {