diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 16:17:12 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 16:17:12 +1000 |
commit | c3634c799028aad7262c67cf1a4710cefe093c01 (patch) | |
tree | 4956e41fa724b1ea9c62d52afc01e88882956d8f /drivers | |
parent | df0b60ba0ccf758c3db940b965c019fc1d3e653a (diff) | |
parent | c0c725d7350ec8b8453257676a440bb4b2df2422 (diff) |
Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gnss/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c index e6f94501cb28..1e82b7967570 100644 --- a/drivers/gnss/core.c +++ b/drivers/gnss/core.c @@ -217,7 +217,7 @@ static void gnss_device_release(struct device *dev) kfree(gdev->write_buf); kfifo_free(&gdev->read_fifo); - ida_simple_remove(&gnss_minors, gdev->id); + ida_free(&gnss_minors, gdev->id); kfree(gdev); } @@ -232,7 +232,7 @@ struct gnss_device *gnss_allocate_device(struct device *parent) if (!gdev) return NULL; - id = ida_simple_get(&gnss_minors, 0, GNSS_MINORS, GFP_KERNEL); + id = ida_alloc_max(&gnss_minors, GNSS_MINORS - 1, GFP_KERNEL); if (id < 0) { kfree(gdev); return NULL; |