diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:52:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:52:48 +1000 |
| commit | 46ab0e9d858c80ff19576f03f3480b050368486e (patch) | |
| tree | d1a4ebfc87d204707a3fb54ff454c8b62165bbae /block | |
| parent | 6c3db49c2523ea43779fdfb0a0f22dfdaf13d283 (diff) | |
| parent | bcec04b3cce4c498ef0d416a3a2aaf0369578151 (diff) | |
| download | linux-next-46ab0e9d858c80ff19576f03f3480b050368486e.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
Diffstat (limited to 'block')
| -rw-r--r-- | block/bsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/bsg.c b/block/bsg.c index 882f56bff14f..2ab1351eb082 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -169,7 +169,7 @@ static void bsg_device_release(struct device *dev) { struct bsg_device *bd = container_of(dev, struct bsg_device, device); - ida_simple_remove(&bsg_minor_ida, MINOR(bd->device.devt)); + ida_free(&bsg_minor_ida, MINOR(bd->device.devt)); kfree(bd); } @@ -196,7 +196,7 @@ struct bsg_device *bsg_register_queue(struct request_queue *q, bd->queue = q; bd->sg_io_fn = sg_io_fn; - ret = ida_simple_get(&bsg_minor_ida, 0, BSG_MAX_DEVS, GFP_KERNEL); + ret = ida_alloc_max(&bsg_minor_ida, BSG_MAX_DEVS - 1, GFP_KERNEL); if (ret < 0) { if (ret == -ENOSPC) dev_err(parent, "bsg: too many bsg devices\n"); |