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

Commit 12081a25 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

media: ddbridge: move CI detach code to ddbridge-ci.c 



Move the CI teardown code to ddbridge-ci.c where everything else related
to CI hardware lives.

Cc: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ae494328

drivers/media/pci/ddbridge/ddbridge-ci.c

+11 −0
Original line number Diff line number Diff line
@@ -346,3 +346,14 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate) 
	dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);

	return 0;

}



void ddb_ci_detach(struct ddb_port *port)

{

	if (port->dvb[0].dev)

		dvb_unregister_device(port->dvb[0].dev);

	if (port->en) {

		dvb_ca_en50221_release(port->en);

		kfree(port->en->data);

		port->en = NULL;

	}

}

drivers/media/pci/ddbridge/ddbridge-ci.h

+1 −0
Original line number Diff line number Diff line
@@ -26,5 +26,6 @@ 
/******************************************************************************/



int ddb_ci_attach(struct ddb_port *port, u32 bitrate);

void ddb_ci_detach(struct ddb_port *port);



#endif /* __DDBRIDGE_CI_H__ */

drivers/media/pci/ddbridge/ddbridge-core.c

+1 −7
Original line number Diff line number Diff line
@@ -2016,13 +2016,7 @@ void ddb_ports_detach(struct ddb *dev) 
			break;

		case DDB_PORT_CI:

		case DDB_PORT_LOOP:

			if (port->dvb[0].dev)

				dvb_unregister_device(port->dvb[0].dev);

			if (port->en) {

				dvb_ca_en50221_release(port->en);

				kfree(port->en->data);

				port->en = NULL;

			}

			ddb_ci_detach(port);

			break;

		}

	}