From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Feb 2014 22:03:52 +0000 (-0800)
Subject: 3.12-stable patches
X-Git-Tag: v3.4.80~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=422ce1c01ba407d0190ecc8c076f513c9f9506ac;p=thirdparty%2Fkernel%2Fstable-queue.git

3.12-stable patches

added patches:
	mei-mei_hbm_dispatch-returns-void.patch
---

diff --git a/queue-3.12/mei-mei_hbm_dispatch-returns-void.patch b/queue-3.12/mei-mei_hbm_dispatch-returns-void.patch
new file mode 100644
index 00000000000..44db2630cf1
--- /dev/null
+++ b/queue-3.12/mei-mei_hbm_dispatch-returns-void.patch
@@ -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>
+Acked-by: 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.12/series b/queue-3.12/series
index bafeffeb5b3..97032dc005a 100644
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -57,3 +57,4 @@ dm-space-map-metadata-fix-bug-in-resizing-of-thin-metadata.patch
 drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch
 drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch
 radeon-pm-guard-access-to-rdev-pm.power_state-array.patch
+mei-mei_hbm_dispatch-returns-void.patch