From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755451AbbITN5q (ORCPT ); Sun, 20 Sep 2015 09:57:46 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:44682 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755293AbbITN5p (ORCPT ); Sun, 20 Sep 2015 09:57:45 -0400 X-Greylist: delayed 360 seconds by postgrey-1.27 at vger.kernel.org; Sun, 20 Sep 2015 09:57:44 EDT From: Nicolas Iooss To: David Airlie , Thomas Hellstrom , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Nicolas Iooss Subject: [PATCH 1/2] drm/vmwgfx: make vmw_kms_helper_dirty return an initialized value Date: Sun, 20 Sep 2015 15:50:56 +0200 Message-Id: <1442757057-645-1-git-send-email-nicolas.iooss_linux@m4x.org> X-Mailer: git-send-email 2.5.2 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Sep 20 15:51:42 2015 +0200 (CEST)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000155, queueID=4BE231408EF07 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In vmw_kms_helper_dirty(), local variable ret is never initialized before begin used in a return statement when vmw_fifo_reserve() fails. Instead of returning an uninitialized value, return -ENOMEM here and remove the useless variable. Signed-off-by: Nicolas Iooss --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 61fb7f3de311..15a6c01cd016 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1685,7 +1685,6 @@ int vmw_kms_helper_dirty(struct vmw_private *dev_priv, struct drm_crtc *crtc; u32 num_units = 0; u32 i, k; - int ret; dirty->dev_priv = dev_priv; @@ -1711,7 +1710,7 @@ int vmw_kms_helper_dirty(struct vmw_private *dev_priv, if (!dirty->cmd) { DRM_ERROR("Couldn't reserve fifo space " "for dirty blits.\n"); - return ret; + return -ENOMEM; } memset(dirty->cmd, 0, dirty->fifo_reserve_size); } -- 2.5.2