diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-08-28 05:46:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-09-23 08:19:55 -0400 |
commit | c38e8657a471e9af42b86009e5d3085031b41fda (patch) | |
tree | b2bb818ff8b099ee5237da0ab3b9db680b520a0b /drivers/media/pci/meye | |
parent | a0ec8d1dc42e4255307cb1b95345c01c327a10a6 (diff) |
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/meye')
-rw-r--r-- | drivers/media/pci/meye/meye.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index 49e047e4a81e..af9cd02fac0c 100644 --- a/drivers/media/pci/meye/meye.c +++ b/drivers/media/pci/meye/meye.c | |||
@@ -1626,23 +1626,18 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) | |||
1626 | meye.mchip_dev = pcidev; | 1626 | meye.mchip_dev = pcidev; |
1627 | 1627 | ||
1628 | meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE); | 1628 | meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE); |
1629 | if (!meye.grab_temp) { | 1629 | if (!meye.grab_temp) |
1630 | v4l2_err(v4l2_dev, "grab buffer allocation failed\n"); | ||
1631 | goto outvmalloc; | 1630 | goto outvmalloc; |
1632 | } | ||
1633 | 1631 | ||
1634 | spin_lock_init(&meye.grabq_lock); | 1632 | spin_lock_init(&meye.grabq_lock); |
1635 | if (kfifo_alloc(&meye.grabq, sizeof(int) * MEYE_MAX_BUFNBRS, | 1633 | if (kfifo_alloc(&meye.grabq, sizeof(int) * MEYE_MAX_BUFNBRS, |
1636 | GFP_KERNEL)) { | 1634 | GFP_KERNEL)) |
1637 | v4l2_err(v4l2_dev, "fifo allocation failed\n"); | ||
1638 | goto outkfifoalloc1; | 1635 | goto outkfifoalloc1; |
1639 | } | 1636 | |
1640 | spin_lock_init(&meye.doneq_lock); | 1637 | spin_lock_init(&meye.doneq_lock); |
1641 | if (kfifo_alloc(&meye.doneq, sizeof(int) * MEYE_MAX_BUFNBRS, | 1638 | if (kfifo_alloc(&meye.doneq, sizeof(int) * MEYE_MAX_BUFNBRS, |
1642 | GFP_KERNEL)) { | 1639 | GFP_KERNEL)) |
1643 | v4l2_err(v4l2_dev, "fifo allocation failed\n"); | ||
1644 | goto outkfifoalloc2; | 1640 | goto outkfifoalloc2; |
1645 | } | ||
1646 | 1641 | ||
1647 | meye.vdev = meye_template; | 1642 | meye.vdev = meye_template; |
1648 | meye.vdev.v4l2_dev = &meye.v4l2_dev; | 1643 | meye.vdev.v4l2_dev = &meye.v4l2_dev; |