renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 04:33:58 +08:00
Code

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

Browse Source 
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: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Daniel Scheller 2017-12-17 10:40:45 -05:00 committed by Mauro Carvalho Chehab
parent ae49432810
commit 12081a25a6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/pci/ddbridge/ddbridge-ci.c
View File

@ -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); dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
return 0; 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;
}
}

1
drivers/media/pci/ddbridge/ddbridge-ci.h
View File

@ -26,5 +26,6 @@
/******************************************************************************/ /******************************************************************************/
int ddb_ci_attach(struct ddb_port *port, u32 bitrate); int ddb_ci_attach(struct ddb_port *port, u32 bitrate);
void ddb_ci_detach(struct ddb_port *port);
#endif /* __DDBRIDGE_CI_H__ */ #endif /* __DDBRIDGE_CI_H__ */

8
drivers/media/pci/ddbridge/ddbridge-core.c
View File

@ -2016,13 +2016,7 @@ void ddb_ports_detach(struct ddb *dev)
break; break;
case DDB_PORT_CI: case DDB_PORT_CI:
case DDB_PORT_LOOP: case DDB_PORT_LOOP:
if (port->dvb[0].dev) ddb_ci_detach(port);
dvb_unregister_device(port->dvb[0].dev);
if (port->en) {
dvb_ca_en50221_release(port->en);
kfree(port->en->data);
port->en = NULL;
}
break; break;
} }
} }