diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:22:22 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:22:22 -0400 |
| commit | 182d74836ab388bc13aa5373d2b4330336113e98 (patch) | |
| tree | 9509d1bb3487bd69f0dde4cb1865400b4a5c112f | |
| parent | d21c88509954ddfc7b103b05a844389a287e112d (diff) | |
| download | longterm-queue-4.18-182d74836ab388bc13aa5373d2b4330336113e98.tar.gz | |
thunderbolt: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch b/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch index bcee0d0..4be793b 100644 --- a/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch +++ b/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch @@ -1,4 +1,4 @@ -From 2cc12751cf464a722ff57b54d17d30c84553f9c0 Mon Sep 17 00:00:00 2001 +From 2b0845576ddd299d91117d5766eb48e99f17db22 Mon Sep 17 00:00:00 2001 From: Aditya Pakki <pakki001@umn.edu> Date: Wed, 20 Mar 2019 10:57:54 -0500 Subject: [PATCH] thunderbolt: Fix to check for kmemdup failure @@ -14,10 +14,10 @@ Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c -index cd96994dc094..504365d46827 100644 +index a63da422638d..551d01f6465c 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -1294,13 +1294,14 @@ int tb_switch_configure(struct tb_switch *sw) +@@ -1216,13 +1216,14 @@ int tb_switch_configure(struct tb_switch *sw) return tb_plug_events_active(sw, true); } @@ -35,7 +35,7 @@ index cd96994dc094..504365d46827 100644 /* * The newer controllers include fused UUID as part of link -@@ -1308,7 +1309,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) +@@ -1230,7 +1231,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) */ cap = tb_switch_find_vse_cap(sw, TB_VSE_CAP_LINK_CONTROLLER); if (cap > 0) { @@ -46,7 +46,7 @@ index cd96994dc094..504365d46827 100644 } else { /* * ICM generates UUID based on UID and fills the upper -@@ -1323,6 +1326,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) +@@ -1245,6 +1248,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) } sw->uuid = kmemdup(uuid, sizeof(uuid), GFP_KERNEL); @@ -56,7 +56,7 @@ index cd96994dc094..504365d46827 100644 } static int tb_switch_add_dma_port(struct tb_switch *sw) -@@ -1372,7 +1378,9 @@ static int tb_switch_add_dma_port(struct tb_switch *sw) +@@ -1290,7 +1296,9 @@ static int tb_switch_add_dma_port(struct tb_switch *sw) if (status) { tb_sw_info(sw, "switch flash authentication failed\n"); @@ -67,9 +67,9 @@ index cd96994dc094..504365d46827 100644 nvm_set_auth_status(sw, status); } -@@ -1422,7 +1430,9 @@ int tb_switch_add(struct tb_switch *sw) +@@ -1340,7 +1348,9 @@ int tb_switch_add(struct tb_switch *sw) } - tb_sw_dbg(sw, "uid: %#llx\n", sw->uid); + tb_sw_info(sw, "uid: %#llx\n", sw->uid); - tb_switch_set_uuid(sw); + ret = tb_switch_set_uuid(sw); |