Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753237Ab3IJXda (ORCPT ); Tue, 10 Sep 2013 19:33:30 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:59299 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753181Ab3IJXd2 (ORCPT ); Tue, 10 Sep 2013 19:33:28 -0400 MIME-Version: 1.0 In-Reply-To: References: Date: Tue, 10 Sep 2013 19:33:27 -0400 Message-ID: Subject: Re: [PATCH] drm/msm: fix return value check in ERR_PTR() From: Rob Clark To: Wei Yongjun Cc: David Airlie , yongjun_wei@trendmicro.com.cn, "dri-devel@lists.freedesktop.org" , Linux Kernel Mailing List Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1463 Lines: 39 On Tue, Sep 10, 2013 at 6:56 PM, Wei Yongjun wrote: > From: Wei Yongjun > > In case of error, the function drm_prime_pages_to_sg() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Signed-off-by: Wei Yongjun good catch, thanks Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c > index 6b5a6c8..3462def 100644 > --- a/drivers/gpu/drm/msm/msm_gem.c > +++ b/drivers/gpu/drm/msm/msm_gem.c > @@ -40,9 +40,9 @@ static struct page **get_pages(struct drm_gem_object *obj) > } > > msm_obj->sgt = drm_prime_pages_to_sg(p, npages); > - if (!msm_obj->sgt) { > + if (IS_ERR(msm_obj->sgt)) { > dev_err(dev->dev, "failed to allocate sgt\n"); > - return ERR_PTR(-ENOMEM); > + return ERR_CAST(msm_obj->sgt); > } > > msm_obj->pages = p; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/