|
@@ -1,4 +1,4 @@
|
|
-From b420c60ae36c19a367834badda4a6a4a3c2b876d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 9db7f91549a7e2c160ec01e3589f5f7c0d6416a0 Mon Sep 17 00:00:00 2001
|
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
|
Date: Sat, 28 Sep 2019 17:48:21 +0200
|
|
Date: Sat, 28 Sep 2019 17:48:21 +0200
|
|
Subject: [PATCH 05/10] suspend
|
|
Subject: [PATCH 05/10] suspend
|
|
@@ -12,7 +12,7 @@ Subject: [PATCH 05/10] suspend
|
|
5 files changed, 162 insertions(+), 6 deletions(-)
|
|
5 files changed, 162 insertions(+), 6 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
|
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
|
-index 33dad9774da0..742b84a6f344 100644
|
|
|
|
|
|
+index 9ea3d8e61100..1bc63549707a 100644
|
|
--- a/drivers/nvme/host/core.c
|
|
--- a/drivers/nvme/host/core.c
|
|
+++ b/drivers/nvme/host/core.c
|
|
+++ b/drivers/nvme/host/core.c
|
|
@@ -1065,15 +1065,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
|
|
@@ -1065,15 +1065,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
|
|
@@ -59,7 +59,7 @@ index 33dad9774da0..742b84a6f344 100644
|
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
|
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
|
{
|
|
{
|
|
u32 q_count = (*count - 1) | ((*count - 1) << 16);
|
|
u32 q_count = (*count - 1) | ((*count - 1) << 16);
|
|
-@@ -3615,6 +3633,18 @@ static void nvme_free_ctrl(struct device *dev)
|
|
|
|
|
|
+@@ -3630,6 +3648,18 @@ static void nvme_free_ctrl(struct device *dev)
|
|
nvme_put_subsystem(subsys);
|
|
nvme_put_subsystem(subsys);
|
|
}
|
|
}
|
|
|
|
|