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

Commit a22407fa authored Nov 14, 2010 by Bjørn Mork Committed by Mauro Carvalho Chehab Dec 29, 2010

[media] Mantis: use dvb_attach to avoid double dereferencing on module removal



Convert the driver to use the dvb_attach macro to avoid the hard dependency
on the frontend drivers.  The hard dependecy will result in loading a
number of unused frontends, and unwanted automatic dereferencing.

This fixes a bug where unloading the mantis driver will derefence any
attached frontend twice, which will cause an oops if the same frontend is
used by another driver.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 9c81496a

drivers/media/dvb/mantis/hopper_vp3028.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ static int vp3028_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		if (err == 0) {
		msleep(250);
		dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
		fe = zl10353_attach(&hopper_vp3028_config, adapter);
		fe = dvb_attach(zl10353_attach, &hopper_vp3028_config, adapter);

		if (!fe)
		return -1;

drivers/media/dvb/mantis/mantis_vp1033.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ static int vp1033_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		msleep(250);

		dprintk(MANTIS_ERROR, 1, "Probing for STV0299 (DVB-S)");
		fe = stv0299_attach(&lgtdqcs001f_config, adapter);
		fe = dvb_attach(stv0299_attach, &lgtdqcs001f_config, adapter);

		if (fe) {
		fe->ops.tuner_ops.set_params = lgtdqcs001f_tuner_set;

drivers/media/dvb/mantis/mantis_vp1034.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ static int vp1034_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		msleep(250);

		dprintk(MANTIS_ERROR, 1, "Probing for MB86A16 (DVB-S/DSS)");
		fe = mb86a16_attach(&vp1034_mb86a16_config, adapter);
		fe = dvb_attach(mb86a16_attach, &vp1034_mb86a16_config, adapter);
		if (fe) {
		dprintk(MANTIS_ERROR, 1,
		"found MB86A16 DVB-S/DSS frontend @0x%02x",

drivers/media/dvb/mantis/mantis_vp1041.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -316,14 +316,14 @@ static int vp1041_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		if (err == 0) {
		mantis_frontend_soft_reset(mantis);
		msleep(250);
		mantis->fe = stb0899_attach(&vp1041_stb0899_config, adapter);
		mantis->fe = dvb_attach(stb0899_attach, &vp1041_stb0899_config, adapter);
		if (mantis->fe) {
		dprintk(MANTIS_ERROR, 1,
		"found STB0899 DVB-S/DVB-S2 frontend @0x%02x",
		vp1041_stb0899_config.demod_address);

		if (stb6100_attach(mantis->fe, &vp1041_stb6100_config, adapter)) {
		if (!lnbp21_attach(mantis->fe, adapter, 0, 0))
		if (dvb_attach(stb6100_attach, mantis->fe, &vp1041_stb6100_config, adapter)) {
		if (!dvb_attach(lnbp21_attach, mantis->fe, adapter, 0, 0))
		dprintk(MANTIS_ERROR, 1, "No LNBP21 found!");
		}
		} else {

drivers/media/dvb/mantis/mantis_vp2033.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ static int vp2033_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		msleep(250);

		dprintk(MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
		fe = tda10021_attach(&vp2033_tda1002x_cu1216_config,
		fe = dvb_attach(tda10021_attach, &vp2033_tda1002x_cu1216_config,
		adapter,
		read_pwm(mantis));

		@@ -141,7 +141,7 @@ static int vp2033_frontend_init(struct mantis_pci mantis, struct dvb_frontend
		"found Philips CU1216 DVB-C frontend (TDA10021) @ 0x%02x",
		vp2033_tda1002x_cu1216_config.demod_address);
		} else {
		fe = tda10023_attach(&vp2033_tda10023_cu1216_config,
		fe = dvb_attach(tda10023_attach, &vp2033_tda10023_cu1216_config,
		adapter,
		read_pwm(mantis));