Merge "nvme: host: core: fix precedence of ternary operator" (12d74737) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/nvme/host/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1331,7 +1331,7 @@ static int nvme_pr_reserve(struct block_device *bdev, u64 key,
		static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
		enum pr_type type, bool abort)
		{
		u32 cdw10 = nvme_pr_type(type) << 8 \| abort ? 2 : 1;
		u32 cdw10 = nvme_pr_type(type) << 8 \| (abort ? 2 : 1);
		return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
		}

		@@ -1343,7 +1343,7 @@ static int nvme_pr_clear(struct block_device *bdev, u64 key)

		static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
		{
		u32 cdw10 = nvme_pr_type(type) << 8 \| key ? 1 << 3 : 0;
		u32 cdw10 = nvme_pr_type(type) << 8 \| (key ? 1 << 3 : 0);
		return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
		}