summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-08 19:21:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-08 19:21:51 +0100
commited63ba15d7830c30077dbb33c94242be01e45a18 (patch)
tree8165313975d57f025e640d33768dbc31493ce5b7 /block
parent5015f8a5ced7039de354c1103b0912f5a64fab03 (diff)
parentdd5a440a31fae6e459c0d6271dddd62825505361 (diff)
Merge 6.9-rc7 into char-misc-testing
We need the char-misc changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/bdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bdev.c b/block/bdev.c
index 4dc94145eb53..da2a167a4d08 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -882,7 +882,7 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
goto abort_claiming;
ret = -EBUSY;
if (!bdev_may_open(bdev, mode))
- goto abort_claiming;
+ goto put_module;
if (bdev_is_partition(bdev))
ret = blkdev_get_part(bdev, mode);
else