diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:04:37 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:04:37 +0100 |
commit | 424449f04b59603a65eab09354df54bdec68f01a (patch) | |
tree | b7def6909ee25449bb8de410bdf5a692dc680c6b /drivers/uio/uio.c | |
parent | 7de24430cd280ca9d19d52a02bf2952601da2897 (diff) | |
parent | 6139f2a02fe0ac7a08389b4eb786e0c659039ddd (diff) |
Merge tag 'v5.15.148' into fslc-5.15-2.2.x-imx
This is the 5.15.148 stable release
Conflicts:
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'drivers/uio/uio.c')
-rw-r--r-- | drivers/uio/uio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 4c502035e378..9d78ead9fc07 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -464,13 +464,13 @@ static int uio_open(struct inode *inode, struct file *filep) mutex_lock(&minor_lock); idev = idr_find(&uio_idr, iminor(inode)); - mutex_unlock(&minor_lock); if (!idev) { ret = -ENODEV; + mutex_unlock(&minor_lock); goto out; } - get_device(&idev->dev); + mutex_unlock(&minor_lock); if (!try_module_get(idev->owner)) { ret = -ENODEV; @@ -1071,9 +1071,8 @@ void uio_unregister_device(struct uio_info *info) wake_up_interruptible(&idev->wait); kill_fasync(&idev->async_queue, SIGIO, POLL_HUP); - device_unregister(&idev->dev); - uio_free_minor(minor); + device_unregister(&idev->dev); return; } |