diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
| commit | c6141ba0110f98266106699aca071fed025c3d64 (patch) | |
| tree | 5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /drivers/md/raid10.c | |
| parent | a1462fb8b5dd1018e3477a6861822d75c6a59449 (diff) | |
| parent | 927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff) | |
| download | linux-next-c6141ba0110f98266106699aca071fed025c3d64.tar.gz linux-next-c6141ba0110f98266106699aca071fed025c3d64.zip | |
ASoC: Merge up fixes
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index efe93b979167..15b9ae5bf84d 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -4020,10 +4020,8 @@ static int raid10_set_queue_limits(struct mddev *mddev) lim.io_opt = lim.io_min * raid10_nr_stripes(conf); lim.features |= BLK_FEAT_ATOMIC_WRITES; err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY); - if (err) { - queue_limits_cancel_update(mddev->gendisk->queue); + if (err) return err; - } return queue_limits_set(mddev->gendisk->queue, &lim); } |