Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3264112e authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman
Browse files

media: budget-core: Improve exception handling in budget_register() 



[ Upstream commit fc0456458df8b3421dba2a5508cd817fbc20ea71 ]

budget_register() has no error handling after its failure.
Add the missed undo functions for error handling to fix it.

Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e42d52ca

drivers/media/pci/ttpci/budget-core.c

+8 −3
Original line number Diff line number Diff line
@@ -386,20 +386,25 @@ static int budget_register(struct budget *budget) 
	ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->hw_frontend);



	if (ret < 0)

		return ret;

		goto err_release_dmx;



	budget->mem_frontend.source = DMX_MEMORY_FE;

	ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->mem_frontend);

	if (ret < 0)

		return ret;

		goto err_release_dmx;



	ret = dvbdemux->dmx.connect_frontend(&dvbdemux->dmx, &budget->hw_frontend);

	if (ret < 0)

		return ret;

		goto err_release_dmx;



	dvb_net_init(&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);



	return 0;



err_release_dmx:

	dvb_dmxdev_release(&budget->dmxdev);

	dvb_dmx_release(&budget->demux);

	return ret;

}



static void budget_unregister(struct budget *budget)