From patchwork Wed Mar 10 22:45:11 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Wilson <chris@chris-wilson.co.uk>
X-Patchwork-Id: 84719
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2AMkG9R006474
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Wed, 10 Mar 2010 22:46:54 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 849B69F62A;
	Wed, 10 Mar 2010 14:46:29 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from orsmga101.jf.intel.com (mga06.intel.com [134.134.136.21])
	by gabe.freedesktop.org (Postfix) with ESMTP id 51F5A9F5EE
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 10 Mar 2010 14:46:04 -0800 (PST)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga101.jf.intel.com with ESMTP; 10 Mar 2010 14:42:41 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.49,616,1262592000"; d="scan'208";a="499618561"
Received: from unknown (HELO localhost.localdomain) ([10.255.13.214])
	by orsmga002.jf.intel.com with ESMTP; 10 Mar 2010 14:45:19 -0800
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Date: Wed, 10 Mar 2010 22:45:11 +0000
Message-Id: <1268261124-13653-25-git-send-email-chris@chris-wilson.co.uk>
X-Mailer: git-send-email 1.7.0
In-Reply-To: <1268261124-13653-1-git-send-email-chris@chris-wilson.co.uk>
References: <1268261124-13653-1-git-send-email-chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Subject: [Intel-gfx] [PATCH 24/37] drm: Check for malloc failure from
	drm_cvt_create().
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 10 Mar 2010 22:46:54 +0000 (UTC)


diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index f24f5ee..0dd3ce4 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -331,6 +331,9 @@ create_mode:
 			    cmdline_mode->refresh_specified ? cmdline_mode->refresh : 60,
 			    cmdline_mode->rb, cmdline_mode->interlace,
 			    cmdline_mode->margins);
+	if (mode == NULL)
+		return NULL;
+
 	drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
 	list_add(&mode->head, &connector->modes);
 	return mode;