Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0b3915 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe
Browse files

nvme: precedence bug in nvme_pr_clear() 



The "|" operator has higher precedence than "?:" so this didn't work as
intended.  I had previously fixed this bug, but it we copied the older
unfixed version when we moved the function between files.

Fixes: 1673f1f0 ('nvme: move block_device_operations and ns/ctrl freeing to common code')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 7b6c0f80

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new, 


static int nvme_pr_clear(struct block_device *bdev, u64 key)

{

	u32 cdw10 = 1 | key ? 1 << 3 : 0;

	u32 cdw10 = 1 | (key ? 1 << 3 : 0);

	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);

}