summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx18/cx18-driver.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-08-28 05:46:57 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-09-23 08:19:55 -0400
commitc38e8657a471e9af42b86009e5d3085031b41fda (patch)
treeb2bb818ff8b099ee5237da0ab3b9db680b520a0b /drivers/media/pci/cx18/cx18-driver.c
parenta0ec8d1dc42e4255307cb1b95345c01c327a10a6 (diff)
downloadtalos-obmc-linux-c38e8657a471e9af42b86009e5d3085031b41fda.tar.gz
talos-obmc-linux-c38e8657a471e9af42b86009e5d3085031b41fda.zip
media: drivers: delete error messages for failed memory allocation
Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. [mchehab@s-opensource.com: fold several similar patches into one] Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Hans Verkuil <hansverk@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx18/cx18-driver.c')
-rw-r--r--drivers/media/pci/cx18/cx18-driver.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 8654710464cc..9e99c6ef1476 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -910,11 +910,9 @@ static int cx18_probe(struct pci_dev *pci_dev,
}
cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC);
- if (cx == NULL) {
- printk(KERN_ERR "cx18: cannot manage card %d, out of memory\n",
- i);
+ if (!cx)
return -ENOMEM;
- }
+
cx->pci_dev = pci_dev;
cx->instance = i;
OpenPOWER on IntegriCloud