git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Mon May 28 08:52:37 CEST 2018
   2 From: Markus Elfring <elfring@users.sourceforge.net>
   3 Date: Thu, 8 Feb 2018 18:42:51 +0100
   4 Subject: drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
   5
   6 From: Markus Elfring <elfring@users.sourceforge.net>
   7
   8 [ Upstream commit 6f0a60298bbbea43ab5e3955913ab19c153076f3 ]
   9
  10 Omit an extra message for a memory allocation failure in these functions.
  11
  12 This issue was detected by using the Coccinelle software.
  13
  14 Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
  15 Signed-off-by: Inki Dae <inki.dae@samsung.com>
  16 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  drivers/gpu/drm/exynos/exynos_drm_g2d.c |    6 ++----
  20  1 file changed, 2 insertions(+), 4 deletions(-)
  21
  22 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
  23 +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
  24 @@ -268,7 +268,6 @@ static int g2d_init_cmdlist(struct g2d_d
  25
  26         node = kcalloc(G2D_CMDLIST_NUM, sizeof(*node), GFP_KERNEL);
  27         if (!node) {
  28 -               dev_err(dev, "failed to allocate memory\n");
  29                 ret = -ENOMEM;
  30                 goto err;
  31         }
  32 @@ -1264,10 +1263,9 @@ int exynos_g2d_exec_ioctl(struct drm_dev
  33                 return -EFAULT;
  34
  35         runqueue_node = kmem_cache_alloc(g2d->runqueue_slab, GFP_KERNEL);
  36 -       if (!runqueue_node) {
  37 -               dev_err(dev, "failed to allocate memory\n");
  38 +       if (!runqueue_node)
  39                 return -ENOMEM;
  40 -       }
  41 +
  42         run_cmdlist = &runqueue_node->run_cmdlist;
  43         event_list = &runqueue_node->event_list;
  44         INIT_LIST_HEAD(run_cmdlist);