diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:38:31 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:38:31 -0400 |
| commit | 615853494c76224c076a9144a291d4ad9314007a (patch) | |
| tree | 97da0202d37a7841dbb96d040d4d7bd2ecaf4495 | |
| parent | f7d37879519df475cc83a180a6929610b226bd66 (diff) | |
| download | longterm-queue-4.18-615853494c76224c076a9144a291d4ad9314007a.tar.gz | |
scsi: drop patch for driver not present in 4.18
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/scsi-ufs-fix-a-missing-check-of-devm_reset_control_g.patch | 32 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/queue/scsi-ufs-fix-a-missing-check-of-devm_reset_control_g.patch b/queue/scsi-ufs-fix-a-missing-check-of-devm_reset_control_g.patch deleted file mode 100644 index c286c8f..0000000 --- a/queue/scsi-ufs-fix-a-missing-check-of-devm_reset_control_g.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 63a06181d7ce169d09843645c50fea1901bc9f0a Mon Sep 17 00:00:00 2001 -From: Kangjie Lu <kjlu@umn.edu> -Date: Fri, 15 Mar 2019 02:11:56 -0500 -Subject: [PATCH] scsi: ufs: fix a missing check of devm_reset_control_get - -commit 63a06181d7ce169d09843645c50fea1901bc9f0a upstream. - -devm_reset_control_get could fail, so the fix checks its return value and -passes the error code upstream in case it fails. - -Signed-off-by: Kangjie Lu <kjlu@umn.edu> -Acked-by: Avri Altman <avri.altman@wdc.com> -Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> - -diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c -index 0e855b5afe82..2f592df921d9 100644 ---- a/drivers/scsi/ufs/ufs-hisi.c -+++ b/drivers/scsi/ufs/ufs-hisi.c -@@ -587,6 +587,10 @@ static int ufs_hisi_init_common(struct ufs_hba *hba) - ufshcd_set_variant(hba, host); - - host->rst = devm_reset_control_get(dev, "rst"); -+ if (IS_ERR(host->rst)) { -+ dev_err(dev, "%s: failed to get reset control\n", __func__); -+ return PTR_ERR(host->rst); -+ } - - ufs_hisi_set_pm_lvl(hba); - --- -2.7.4 - diff --git a/queue/series b/queue/series index c73befa..2b74948 100644 --- a/queue/series +++ b/queue/series @@ -130,7 +130,6 @@ media-m88ds3103-serialize-reset-messages-in-m88ds310.patch media-staging-davinci_vpfe-disallow-building-with-CO.patch drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch drm-amd-display-Set-stream-mode_changed-when-connect.patch -scsi-ufs-fix-a-missing-check-of-devm_reset_control_g.patch media-vimc-stream-fix-thread-state-before-sleep.patch media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch media-go7007-avoid-clang-frame-overflow-warning-with.patch |