From patchwork Thu Nov 20 08:53:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5346701 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 A9474C11AC for ; Thu, 20 Nov 2014 08:53:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFBEC201F5 for ; Thu, 20 Nov 2014 08:53:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 09313201FB for ; Thu, 20 Nov 2014 08:53:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96B366E4E2; Thu, 20 Nov 2014 00:53:18 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id A526E6E2D4 for ; Thu, 20 Nov 2014 00:53:16 -0800 (PST) Received: by mail-wi0-f173.google.com with SMTP id r20so7936480wiv.6 for ; Thu, 20 Nov 2014 00:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=4fBV4rQ1lCFpO54sFZv4GsTPSwEJ08I4SRqbnBr/tak=; b=c9FdIz1/wsn1fj7gIhQXT5N3NRME1z6YP0KyzT3AoBx6bcc0OQVaf8Qn6/z2cbRtEH Rt6ceDS88FELKVgGlcGYnz2WX2yfq/ubgkkJUoj66ZPSys+ix8yNuLl7CQjdumI25GUr gQwAr5PJXHkGZTNFnQ/hGgZxu0pr9WF8o5xBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4fBV4rQ1lCFpO54sFZv4GsTPSwEJ08I4SRqbnBr/tak=; b=GWGcihz1QYM5GFR2CZfaw7GANdSGheDV68WjFbR2A08WMidjsGaDLF538evL9UEzQX QbGSBDC0LsSnJ+O5Bvw7tFfex3Lnx1lpmBgFPv8Mncpdy+jugQMsbXLXNI7ujBhEY4Ci iKPnYmtVwiRtZUUzXdfP9DXtdoPAAbYjumRZHOvB+gHQKLiEpS1yif3D7Umr9WdaxNRT f3cjPKBz/9ywu0KxKdMmexzCv22Wj8tu5p/ATIAYIEn9sh7WuYYTDFJGNo22URx7iM1s jKtcVRz1y/dZ3esOWNiBexYvH5hI5pCo6yDA8l/wtwkzj8+AQT2858t8KDI7nbZg+Jna 3inA== X-Gm-Message-State: ALoCoQnbpKBemzvjkICjXKK5hYqJoRRDBih+pZSNhGutdax9mC2RC1i9HVBt7afwhU77pzAgAupa X-Received: by 10.181.8.70 with SMTP id di6mr13703203wid.9.1416473595833; Thu, 20 Nov 2014 00:53:15 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id mu4sm5654513wib.2.2014.11.20.00.53.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Nov 2014 00:53:14 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/atomic: Add missing ERR_PTR casting Date: Thu, 20 Nov 2014 09:53:35 +0100 Message-Id: <1416473615-17267-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 This is an oversight from commit f52b69f1ecfdd7ef6867a257620258c09e569552 Author: Daniel Vetter Date: Wed Nov 19 18:38:08 2014 +0100 drm/atomic: Don't overrun the connector array when hotplugging Cc: Dave Airlie Cc: Rob Clark Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 3624632084e2..d3b46746b611 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -318,7 +318,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, */ if (index >= state->num_connector) { DRM_DEBUG_KMS("Hot-added connector would overflow state array, restarting\n"); - return -EAGAIN; + return ERR_PTR(-EAGAIN); } if (state->connector_states[index])