diff mbox series

[5.11,33/36] scsi: ufs: Fix a duplicate dev quirk number

Message ID	20210310132321.563924115@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Bean Huo <beanhuo@micron.com>, Avri Altman <avri.altman@wdc.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.11 33/36] scsi: ufs: Fix a duplicate dev quirk number Date: Wed, 10 Mar 2021 14:23:46 +0100 Message-Id: <20210310132321.563924115@linuxfoundation.org> In-Reply-To: <20210310132320.510840709@linuxfoundation.org> References: <20210310132320.510840709@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.11,03/36] io_uring: deduplicate core cancellations sequence [5.11,04/36] io_uring: unpark SQPOLL thread for cancelation [5.11,06/36] fs: provide locked helper variant of close_fd_get_file() [5.11,07/36] io_uring: get rid of intermediate IORING_OP_CLOSE stage [5.11,09/36] io_uring/io-wq: return 2-step work swap scheme [5.11,14/36] arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+ [5.11,16/36] btrfs: dont flush from btrfs_delayed_inode_reserve_metadata [5.11,17/36] iommu/amd: Fix sleeping in atomic in increase_address_space() [5.11,18/36] scsi: ufs-mediatek: Enable UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL [5.11,20/36] misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom [5.11,22/36] scsi: ufs: ufs-exynos: Apply vendor-specific values for three timeouts [5.11,25/36] mmc: sdhci-of-dwcmshc: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN [5.11,27/36] ALSA: usb-audio: Add DJM750 to Pioneer mixer quirk [5.11,28/36] ALSA: usb-audio: add mixer quirks for Pioneer DJM-900NXS2 [5.11,29/36] HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E [5.11,30/36] PCI: cadence: Retrain Link to work around Gen2 training defect [5.11,32/36] ASoC: Intel: sof_sdw: add quirk for HP Spectre x360 convertible [5.11,33/36] scsi: ufs: Fix a duplicate dev quirk number [5.11,35/36] nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST. [5.11,36/36] nvme-pci: add quirks for Lexar 256GB SSD

Commit Message

Greg KH March 10, 2021, 1:23 p.m. UTC

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

From: Avri Altman <avri.altman@wdc.com>

[ Upstream commit 9599a1cf23330008d90b7c232efe95de7510ff29 ]

Fixes: 2b2bfc8aa519 ("scsi: ufs: Introduce a quirk to allow only page-aligned sg entries")
Link: https://lore.kernel.org/r/20210211104638.292499-1-avri.altman@wdc.com
Reviewed-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/scsi/ufs/ufshcd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 8cb64ae95462..1885ec9126c4 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -560,7 +560,7 @@  enum ufshcd_quirks {
 	/*
 	 * This quirk allows only sg entries aligned with page size.
 	 */
-	UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE		= 1 << 13,
+	UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE		= 1 << 14,
 };
 
 enum ufshcd_caps {