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

Commit cf3167cf authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] pt3: fix DTV FE I2C driver load error paths 



Get rid of 'module_is_live' usage.

on x86_64:
when CONFIG_MODULES is not enabled:

../drivers/media/pci/pt3/pt3.c: In function 'pt3_attach_fe':
../drivers/media/pci/pt3/pt3.c:433:6: error: implicit declaration of function 'module_is_live' [-Werror=implicit-function-declaration]

Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Akihiro Tsukada <tskd08@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 214635f9

drivers/media/pci/pt3/pt3.c

+11 −12
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int pt3_attach_fe(struct pt3_board *pt3, int i) 
		return -ENODEV;

	pt3->adaps[i]->i2c_demod = cl;

	if (!try_module_get(cl->dev.driver->owner))

		goto err_demod;

		goto err_demod_i2c_unregister_device;



	if (!strncmp(cl->name, TC90522_I2C_DEV_SAT, sizeof(cl->name))) {

		struct qm1d1c0042_config tcfg;
@@ -415,28 +415,27 @@ static int pt3_attach_fe(struct pt3_board *pt3, int i) 
		cl = i2c_new_device(cfg.tuner_i2c, &info);

	}

	if (!cl || !cl->dev.driver)

		goto err_demod;

		goto err_demod_module_put;

	pt3->adaps[i]->i2c_tuner = cl;

	if (!try_module_get(cl->dev.driver->owner))

		goto err_tuner;

		goto err_tuner_i2c_unregister_device;



	dvb_adap = &pt3->adaps[one_adapter ? 0 : i]->dvb_adap;

	ret = dvb_register_frontend(dvb_adap, cfg.fe);

	if (ret < 0)

		goto err_tuner;

		goto err_tuner_module_put;

	pt3->adaps[i]->fe = cfg.fe;

	return 0;



err_tuner:

	i2c_unregister_device(pt3->adaps[i]->i2c_tuner);

	if (pt3->adaps[i]->i2c_tuner->dev.driver->owner &&

	    module_is_live(pt3->adaps[i]->i2c_tuner->dev.driver->owner))

err_tuner_module_put:

	module_put(pt3->adaps[i]->i2c_tuner->dev.driver->owner);

err_demod:

	i2c_unregister_device(pt3->adaps[i]->i2c_demod);

	if (pt3->adaps[i]->i2c_demod->dev.driver->owner &&

	    module_is_live(pt3->adaps[i]->i2c_demod->dev.driver->owner))

err_tuner_i2c_unregister_device:

	i2c_unregister_device(pt3->adaps[i]->i2c_tuner);

err_demod_module_put:

	module_put(pt3->adaps[i]->i2c_demod->dev.driver->owner);

err_demod_i2c_unregister_device:

	i2c_unregister_device(pt3->adaps[i]->i2c_demod);



	return ret;

}