Merge 3.8-rc4 into char-misc-next

This brings in all of the mei and other fixes that are needed to continue
development in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 11 insertions, 3 deletions

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 158da5a81a66..3c09cbb70b1d 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 
 #include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
 
 /* Serialize access to ssc_list and user count */
 static DEFINE_SPINLOCK(user_lock);
@@ -131,6 +132,13 @@ static int ssc_probe(struct platform_device *pdev)
         struct resource *regs;
         struct ssc_device *ssc;
         const struct atmel_ssc_platform_data *plat_dat;
+        struct pinctrl *pinctrl;
+
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                dev_err(&pdev->dev, "Failed to request pinctrl\n");
+                return PTR_ERR(pinctrl);
+        }
 
         ssc = devm_kzalloc(&pdev->dev, sizeof(struct ssc_device), GFP_KERNEL);
         if (!ssc) {
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 7199e8369f1e..263ed4ccd6f2 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -200,13 +200,13 @@ int mei_amthif_read(struct mei_device *dev, struct file *file,
                 wait_ret = wait_event_interruptible(dev->iamthif_cl.wait,
                         (cb = mei_amthif_find_read_list_entry(dev, file)));
 
+                /* Locking again the Mutex */
+                mutex_lock(&dev->device_lock);
+
                 if (wait_ret)
                         return -ERESTARTSYS;
 
                 dev_dbg(&dev->pdev->dev, "woke up from sleep\n");
-
-                /* Locking again the Mutex */
-                mutex_lock(&dev->device_lock);
         }