Skip to content

Commit a4aebaf

Browse files
committed
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
1 parent 96d8569 commit a4aebaf

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

drivers/media/dvb-core/dvbdev.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
530530
for (minor = 0; minor < MAX_DVB_MINORS; minor++)
531531
if (!dvb_minors[minor])
532532
break;
533+
#else
534+
minor = nums2minor(adap->num, type, id);
535+
#endif
533536
if (minor >= MAX_DVB_MINORS) {
534537
if (new_node) {
535538
list_del(&new_node->list_head);
@@ -543,17 +546,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
543546
mutex_unlock(&dvbdev_register_lock);
544547
return -EINVAL;
545548
}
546-
#else
547-
minor = nums2minor(adap->num, type, id);
548-
if (minor >= MAX_DVB_MINORS) {
549-
dvb_media_device_free(dvbdev);
550-
list_del(&dvbdev->list_head);
551-
kfree(dvbdev);
552-
*pdvbdev = NULL;
553-
mutex_unlock(&dvbdev_register_lock);
554-
return ret;
555-
}
556-
#endif
549+
557550
dvbdev->minor = minor;
558551
dvb_minors[minor] = dvb_device_get(dvbdev);
559552
up_write(&minor_rwsem);

0 commit comments

Comments
 (0)