]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.13-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Feb 2014 22:43:49 +0000 (14:43 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Feb 2014 22:43:49 +0000 (14:43 -0800)
added patches:
mei-mei_hbm_dispatch-returns-void.patch

queue-3.13/mei-mei_hbm_dispatch-returns-void.patch [new file with mode: 0644]
queue-3.13/series [new file with mode: 0644]

diff --git a/queue-3.13/mei-mei_hbm_dispatch-returns-void.patch b/queue-3.13/mei-mei_hbm_dispatch-returns-void.patch
new file mode 100644 (file)
index 0000000..9e25451
--- /dev/null
@@ -0,0 +1,39 @@
+From pebolle@tiscali.nl  Thu Feb  6 14:41:08 2014
+From: Paul Bolle <pebolle@tiscali.nl>
+Date: Thu, 06 Feb 2014 22:53:29 +0100
+Subject: mei: mei_hbm_dispatch() returns void
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com>, Alexander Usyskin <alexander.usyskin@intel.com>
+Message-ID: <1391723609.1782.2.camel@x220>
+
+From: Paul Bolle <pebolle@tiscali.nl>
+
+Building hbm.o for v3.13.2 triggers a GCC warning:
+    drivers/misc/mei/hbm.c: In function 'mei_hbm_dispatch':
+    drivers/misc/mei/hbm.c:596:3: warning: 'return' with a value, in function returning void [enabled by default]
+       return 0;
+       ^
+
+GCC is correct, obviously. So let's return void instead of zero here.
+
+Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
+Cc: Tomas Winkler <tomas.winkler@intel.com>
+Cc: Alexander Usyskin <alexander.usyskin@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+Compile tested only.
+
+ drivers/misc/mei/hbm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/misc/mei/hbm.c
++++ b/drivers/misc/mei/hbm.c
+@@ -593,7 +593,7 @@ void mei_hbm_dispatch(struct mei_device
+        */
+       if (dev->hbm_state == MEI_HBM_IDLE) {
+               dev_dbg(&dev->pdev->dev, "hbm: state is idle ignore spurious messages\n");
+-              return 0;
++              return;
+       }
+       switch (mei_msg->hbm_cmd) {
diff --git a/queue-3.13/series b/queue-3.13/series
new file mode 100644 (file)
index 0000000..69bf3fd
--- /dev/null
@@ -0,0 +1 @@
+mei-mei_hbm_dispatch-returns-void.patch