Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:59 +0100
commitc4c6bacf09a823e3bcc3ee472148030a9a481dfb (patch)
tree311763888af0d89770568750e95164105616ae8c
parent6a7a608063f419ead2fc5c674cb8edcca71cfcde (diff)
samples: mei: use /dev/mei0 instead of /dev/mei (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-016-samples-mei-use-dev-mei0-instead-of-dev-mei.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-016-samples-mei-use-dev-mei0-instead-of-dev-mei.patch b/patches.kernel.org/4.20.9-016-samples-mei-use-dev-mei0-instead-of-dev-mei.patch
new file mode 100644
index 0000000000..21dfb4c331
--- /dev/null
+++ b/patches.kernel.org/4.20.9-016-samples-mei-use-dev-mei0-instead-of-dev-mei.patch
@@ -0,0 +1,36 @@
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Thu, 24 Jan 2019 14:45:03 +0200
+Subject: [PATCH] samples: mei: use /dev/mei0 instead of /dev/mei
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: c4a46acf1db3ce547d290c29e55b3476c78dd76c
+
+commit c4a46acf1db3ce547d290c29e55b3476c78dd76c upstream.
+
+The device was moved from misc device to character devices
+to support multiple mei devices.
+
+Cc: <stable@vger.kernel.org> #v4.9+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ samples/mei/mei-amt-version.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/samples/mei/mei-amt-version.c b/samples/mei/mei-amt-version.c
+index 33e67bd1dc34..32234481ad7d 100644
+--- a/samples/mei/mei-amt-version.c
++++ b/samples/mei/mei-amt-version.c
+@@ -117,7 +117,7 @@ static bool mei_init(struct mei *me, const uuid_le *guid,
+
+ me->verbose = verbose;
+
+- me->fd = open("/dev/mei", O_RDWR);
++ me->fd = open("/dev/mei0", O_RDWR);
+ if (me->fd == -1) {
+ mei_err(me, "Cannot establish a handle to the Intel MEI driver\n");
+ goto err;
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 69c4570a29..71ec95bd08 100644
--- a/series.conf
+++ b/series.conf
@@ -1098,6 +1098,7 @@
patches.kernel.org/4.20.9-013-misc-vexpress-Off-by-one-in-vexpress_syscfg_ex.patch
patches.kernel.org/4.20.9-014-cfg80211-call-disconnect_wk-when-AP-stops.patch
patches.kernel.org/4.20.9-015-mei-me-add-ice-lake-point-device-id.patch
+ patches.kernel.org/4.20.9-016-samples-mei-use-dev-mei0-instead-of-dev-mei.patch
########################################################
# Build fixes that apply to the vanilla kernel too.