From patchwork Mon Aug 26 07:15:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2849476 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DC735BF546 for ; Mon, 26 Aug 2013 09:39:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A55EF201B2 for ; Mon, 26 Aug 2013 09:39:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9274120177 for ; Mon, 26 Aug 2013 09:39:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CB9DE6F0B for ; Mon, 26 Aug 2013 02:39:51 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f48.google.com (mail-bk0-f48.google.com [209.85.214.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 3AF8DE5D31 for ; Mon, 26 Aug 2013 00:15:39 -0700 (PDT) Received: by mail-bk0-f48.google.com with SMTP id my13so954964bkb.35 for ; Mon, 26 Aug 2013 00:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=K2Tm2Pq+7JcfvfbHny0pkBeNZUtrUhH3rReFeqVgi48=; b=z4KTLfgIEYAujkcqKWR/UqXHJ4NNTdovqxrj6jIU5V1p0e/oIX3CxZFWAJWkM5YllS 9wj2h9FGipUTwA7EeXfOxE48xYcOY+t6DJmwmeDctKmsNMoNWo91m3nQHbI7pK0FR+nM J+dzTpS35RYQqNxpsCSaJxET937KkFGQlwKRRBr8apYgedMyIY09yvsGFOugWOFYQvwD saiE9Hr+EIBjEL/mydoaE28Bc9wr4ATvn+0PIYgkID5cNQuoUKgxUxybqdMkWSYCCDu0 P1aqHicgUWKF9KPP0PKBzMg4GW21kndhdZ6IVh00hwboWjnc+B2daQvvEIP6dNdB188E nuNA== MIME-Version: 1.0 X-Received: by 10.204.162.10 with SMTP id t10mr699017bkx.26.1377501337900; Mon, 26 Aug 2013 00:15:37 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Mon, 26 Aug 2013 00:15:37 -0700 (PDT) Date: Mon, 26 Aug 2013 15:15:37 +0800 Message-ID: Subject: [PATCH] drm/vmwgfx: fix error return code in vmw_driver_load() From: Wei Yongjun To: airlied@linux.ie, airlied@redhat.com, thellstrom@vmware.com, brianp@vmware.com, dtor@vmware.com, daniel.vetter@ffwll.ch X-Mailman-Approved-At: Mon, 26 Aug 2013 02:39:35 -0700 Cc: yongjun_wei@trendmicro.com.cn, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Fix to return -ENOMEM in the fence manager init error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Acked-by: Dmitry Torokhov --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 78e2164..6dafefc 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -622,8 +622,10 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) } dev_priv->fman = vmw_fence_manager_init(dev_priv); - if (unlikely(dev_priv->fman == NULL)) + if (unlikely(dev_priv->fman == NULL)) { + ret = -ENOMEM; goto out_no_fman; + } vmw_kms_save_vga(dev_priv);