Unverified Commit 70125123 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Zicheng Qu <quzicheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IQLM5HIASIWYZ3THGLERMX2JL2AY5BVR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB5KR8 
 
Link:https://gitee.com/openeuler/kernel/pulls/13912

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents df4c334b 7e531866

drivers/media/dvb-core/dvbdev.c

+4 −11
Original line number Diff line number Diff line
@@ -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);