media: dvbdev: fix the logic when DVB_DYNAMIC_MINORS is not set

When CONFIG_DVB_DYNAMIC_MINORS, ret is not initialized, and a
semaphore is left at the wrong state, in case of errors.

Make the code simpler and avoid mistakes by having just one error
check logic used weather DVB_DYNAMIC_MINORS is used or not.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202410201717.ULWWdJv8-lkp@intel.com/
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/9e067488d8935b8cf00959764a1fa5de85d65725.1730926254.git.mchehab+huawei@kernel.org

diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 14f323fbada719f717fb7fe9f6f2a3ce81e609a3..9df7c213716aec54bab7fde2c94ac030696fe25f 100644 (file)
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -530,6 +530,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
        for (minor = 0; minor < MAX_DVB_MINORS; minor++)
                if (!dvb_minors[minor])
                        break;
+#else
+       minor = nums2minor(adap->num, type, id);
+#endif
        if (minor >= MAX_DVB_MINORS) {
                if (new_node) {
                        list_del(&new_node->list_head);
@@ -543,17 +546,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
                mutex_unlock(&dvbdev_register_lock);
                return -EINVAL;
        }
-#else
-       minor = nums2minor(adap->num, type, id);
-       if (minor >= MAX_DVB_MINORS) {
-               dvb_media_device_free(dvbdev);
-               list_del(&dvbdev->list_head);
-               kfree(dvbdev);
-               *pdvbdev = NULL;
-               mutex_unlock(&dvbdev_register_lock);
-               return ret;
-       }
-#endif
+
        dvbdev->minor = minor;
        dvb_minors[minor] = dvb_device_get(dvbdev);
        up_write(&minor_rwsem);