From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753537AbcD1JfX (ORCPT ); Thu, 28 Apr 2016 05:35:23 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752650AbcD1JfU (ORCPT ); Thu, 28 Apr 2016 05:35:20 -0400 From: Arnd Bergmann To: Alex Deucher , Michal Hocko Cc: Arnd Bergmann , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Felix Kuehling , Jammy Zhou , Monk Liu , Jack Xiao , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get Date: Thu, 28 Apr 2016 11:33:48 +0200 Message-Id: <1461836093-1436847-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:6+MKe+RgbgodxIoJbWXxwV3GpLLmWZ5ACmq34IqwTFAyJVI2h5+ +u7pmvIi+ZNWvDobAGEF5U1wrkTCASqQx4dVFZoFDd+CKz5PKiovUKfQVxErkk7iLykIKRl p7GLR1J3hbfgM4Mak27oBms4XDNg9GlW8C2Cun9c4m4PwGvpEciiOM2JfeP9GR81c+GQV6E 6gMbJjuhfWb1Px99zqxeg== X-UI-Out-Filterresults: notjunk:1;V01:K0:V1PoqmC/rQM=:EtFdLOe2SWyPBMD7+142He DumX85c1b1rXq8ZEav4aUt1v79cqW5uwrhRw8oW8LH9g6hIBf6rUZfkcN5RjHVAqKFP9zMSH5 Kk5EM3TaTijovv0KHhSxQ33Ra1JGx1bw+mrBncQTaDu4k4jbqr57URAGAI+DRB7LWGyB/KM0U JkyHwPmyt6TpSNoFK6Kna7AeZrwjPs705oXSiQy/NxlU9iDcS8ZCCnGw3UdJMGuOUfQ+DY8ys lVfRw4YTHzCIvNcQMr0Q/hFy4ff/gb+4qldj0mhql5BayBN7BRZET5/FG/oGCLiB+RtfpfztE NMuKet8rjPSOGR8pwv906NBvwnurN+7jzAd6ZJz6RGHLV86FNbsJd8yadZiPfBUxcHYIno4Oe 3/xReRMsoTcB9XHlDz76s7840y3aRDUaFqzgMAMclzKJNdz1mBh8EnunM3EWtsaYjFz6MX9rV 8SvcLrfjlZSnTIz/LCeMT2+kqXhpWZx4aAXnOeH95IIsLsEiDwjWm5TctkzHHF+rjgxwaDRS4 AQLUVoWrUF0k4XkSt/VjqsOFtjcV83k8rxOhLg9bsXLayJVQ66KnXWFr1iNKIJ9X9ez/t/Otq pB6nqbW8GdO4TTe2NPhPlsxIl05ph06PCOt/bP/7g8RY6Vi6aAcD8T/CMI8tZ9OjYQDDa9Yq9 DgQ5E9XQu9udhr23RFLAUPmdC8zyJdtkWkdSDe/lpCjFwpbutkIHdzOwWnSaiXUSFeBo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added failure path in amdgpu_mn_get() use the wrong return type: drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c: In function 'amdgpu_mn_get': drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c:237:10: error: return makes pointer from integer without a cast This adds the necessary ERR_PTR() conversion. Signed-off-by: Arnd Bergmann Fixes: ad35eee9fb17 ("drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable") --- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c index cf90686a50d1..32fa7b7913f7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c @@ -234,7 +234,7 @@ static struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) mutex_lock(&adev->mn_lock); if (down_write_killable(&mm->mmap_sem)) { mutex_unlock(&adev->mn_lock); - return -EINTR; + return ERR_PTR(-EINTR); } hash_for_each_possible(adev->mn_hash, rmn, node, (unsigned long)mm) -- 2.7.0