summaryrefslogtreecommitdiff
path: root/drivers/media/pci/ddbridge/ddbridge-ci.c
diff options
context:
space:
mode:
authorDaniel Scheller <d.scheller@gmx.net>2018-03-17 10:55:32 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-04 14:20:24 -0400
commit2dc3e050466c7399705512c6797a400de9224439 (patch)
treeb3d3cd2d50284be91971801bf66442d2cd9a5ef0 /drivers/media/pci/ddbridge/ddbridge-ci.c
parent53dcd70eb710607b2d4085ca91a433cd9feb7b41 (diff)
media: ddbridge, cxd2099: include guard, fix unneeded NULL init, strings
Three really tiny minors in this single commit which all on their own would just clutter up the commit history unnecessarily: * ddbridge-regs.h is lacking an include guard. Add it. * Fix an unnecessary NULL initialisation in ddbridge-ci. The declaration of the ci struct ptr is immediately followed by kzalloc(). * Clarify that the CXD2099AR is a Sony device in the cxd2099 driver at a few places including Kconfig. Signed-off-by: Daniel Scheller <d.scheller@gmx.net> Acked-by: Jasmin Jessich <jasmin@anw.at> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/pci/ddbridge/ddbridge-ci.c')
-rw-r--r--drivers/media/pci/ddbridge/ddbridge-ci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.c b/drivers/media/pci/ddbridge/ddbridge-ci.c
index a9dbc4ebf94f..cfe23d02e561 100644
--- a/drivers/media/pci/ddbridge/ddbridge-ci.c
+++ b/drivers/media/pci/ddbridge/ddbridge-ci.c
@@ -164,7 +164,7 @@ static struct dvb_ca_en50221 en_templ = {
static void ci_attach(struct ddb_port *port)
{
- struct ddb_ci *ci = NULL;
+ struct ddb_ci *ci;
ci = kzalloc(sizeof(*ci), GFP_KERNEL);
if (!ci)