54 files changed, 3075 insertions, 858 deletions

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 023a32cfac42..540166443c34 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -449,7 +449,7 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
 
         gc->base = chip->gpio_start;
         gc->ngpio = gpios;
-        gc->label = chip->client->name;
+        gc->label = dev_name(&chip->client->dev);
         gc->parent = &chip->client->dev;
         gc->owner = THIS_MODULE;
         gc->names = chip->names;
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index 76382c858c35..1246d69ba187 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_runtime.h>
 
 #define DRIVER_NAME "memstick"
 
@@ -436,6 +437,7 @@ static void memstick_check(struct work_struct *work)
         struct memstick_dev *card;
 
         dev_dbg(&host->dev, "memstick_check started\n");
+        pm_runtime_get_noresume(host->dev.parent);
         mutex_lock(&host->lock);
         if (!host->card) {
                 if (memstick_power_on(host))
@@ -479,6 +481,7 @@ out_power_off:
                 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF);
 
         mutex_unlock(&host->lock);
+        pm_runtime_put(host->dev.parent);
         dev_dbg(&host->dev, "memstick_check finished\n");
 }
 
diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
index 4f64563df7de..97308dc28ccf 100644
--- a/drivers/memstick/host/rtsx_usb_ms.c
+++ b/drivers/memstick/host/rtsx_usb_ms.c
@@ -40,15 +40,14 @@ struct rtsx_usb_ms {
 
         struct mutex            host_mutex;
         struct work_struct      handle_req;
-
-        struct task_struct      *detect_ms;
-        struct completion       detect_ms_exit;
+        struct delayed_work     poll_card;
 
         u8                      ssc_depth;
         unsigned int            clock;
         int                     power_mode;
         unsigned char           ifmode;
         bool                    eject;
+        bool                    system_suspending;
 };
 
 static inline struct device *ms_dev(struct rtsx_usb_ms *host)
@@ -545,7 +544,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)
                                                 host->req->error);
                         }
                 } while (!rc);
-                pm_runtime_put(ms_dev(host));
+                pm_runtime_put_sync(ms_dev(host));
         }
 
 }
@@ -585,14 +584,14 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,
                         break;
 
                 if (value == MEMSTICK_POWER_ON) {
-                        pm_runtime_get_sync(ms_dev(host));
+                        pm_runtime_get_noresume(ms_dev(host));
                         err = ms_power_on(host);
+                        if (err)
+                                pm_runtime_put_noidle(ms_dev(host));
                 } else if (value == MEMSTICK_POWER_OFF) {
                         err = ms_power_off(host);
-                        if (host->msh->card)
+                        if (!err)
                                 pm_runtime_put_noidle(ms_dev(host));
-                        else
-                                pm_runtime_put(ms_dev(host));
                 } else
                         err = -EINVAL;
                 if (!err)
@@ -638,12 +637,16 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,
         }
 out:
         mutex_unlock(&ucr->dev_mutex);
-        pm_runtime_put(ms_dev(host));
+        pm_runtime_put_sync(ms_dev(host));
 
         /* power-on delay */
-        if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON)
+        if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON) {
                 usleep_range(10000, 12000);
 
+                if (!host->eject)