On Tue, Sep 10, 2013 at 6:56 PM, Wei Yongjun <weiyj.lk@xxxxxxxxx> wrote:
> From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
>
> 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 <yongjun_wei@xxxxxxxxxxxxxxxxx>
good catch, thanks
Signed-off-by: Rob Clark <robdclark@xxxxxxxxx>
> ---
> 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;
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
