From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 12 Apr 2017 08:33:50 +0000 Subject: [PATCH] drm/edid: checking for NULL instead of IS_ERR Message-Id: <20170412083350.GD3250@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daniel Vetter , David Airlie Cc: kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org drm_mode_create_tile_group() uses error pointers, it doesn't return NULL. I re-arranged it a tiny bit to be more clear. Fixes: 40d9b043a89e ("drm/connector: store tile information from displayid (v3)") Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index fad3d44e4642..c6bc21673885 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4522,9 +4522,9 @@ static int drm_parse_tiled_block(struct drm_connector *connector, tg = drm_mode_get_tile_group(connector->dev, tile->topology_id); if (!tg) { tg = drm_mode_create_tile_group(connector->dev, tile->topology_id); + if (IS_ERR(tg)) + return PTR_ERR(tg); } - if (!tg) - return -ENOMEM; if (connector->tile_group != tg) { /* if we haven't got a pointer, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/edid: checking for NULL instead of IS_ERR Date: Wed, 12 Apr 2017 11:33:50 +0300 Message-ID: <20170412083350.GD3250@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 980676E693 for ; Wed, 12 Apr 2017 08:34:13 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , David Airlie Cc: kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org ZHJtX21vZGVfY3JlYXRlX3RpbGVfZ3JvdXAoKSB1c2VzIGVycm9yIHBvaW50ZXJzLCBpdCBkb2Vz bid0IHJldHVybgpOVUxMLiAgSSByZS1hcnJhbmdlZCBpdCBhIHRpbnkgYml0IHRvIGJlIG1vcmUg Y2xlYXIuCgpGaXhlczogNDBkOWIwNDNhODllICgiZHJtL2Nvbm5lY3Rvcjogc3RvcmUgdGlsZSBp bmZvcm1hdGlvbiBmcm9tIGRpc3BsYXlpZCAodjMpIikKU2lnbmVkLW9mZi1ieTogRGFuIENhcnBl bnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZWRpZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKaW5kZXggZmFkM2Q0 NGU0NjQyLi5jNmJjMjE2NzM4ODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRp ZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5jCkBAIC00NTIyLDkgKzQ1MjIsOSBA QCBzdGF0aWMgaW50IGRybV9wYXJzZV90aWxlZF9ibG9jayhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yLAogCXRnID0gZHJtX21vZGVfZ2V0X3RpbGVfZ3JvdXAoY29ubmVjdG9yLT5kZXYs IHRpbGUtPnRvcG9sb2d5X2lkKTsKIAlpZiAoIXRnKSB7CiAJCXRnID0gZHJtX21vZGVfY3JlYXRl X3RpbGVfZ3JvdXAoY29ubmVjdG9yLT5kZXYsIHRpbGUtPnRvcG9sb2d5X2lkKTsKKwkJaWYgKElT X0VSUih0ZykpCisJCQlyZXR1cm4gUFRSX0VSUih0Zyk7CiAJfQotCWlmICghdGcpCi0JCXJldHVy biAtRU5PTUVNOwogCiAJaWYgKGNvbm5lY3Rvci0+dGlsZV9ncm91cCAhPSB0ZykgewogCQkvKiBp ZiB3ZSBoYXZlbid0IGdvdCBhIHBvaW50ZXIsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo=