From patchwork Wed Nov 7 16:29:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 1713981 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 8A1273FC8F for ; Thu, 8 Nov 2012 07:25:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 656BEA09C0 for ; Wed, 7 Nov 2012 23:25:35 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTP id EAEFF9F66B for ; Wed, 7 Nov 2012 08:29:32 -0800 (PST) Received: by mail-pa0-f49.google.com with SMTP id bi5so1188408pad.36 for ; Wed, 07 Nov 2012 08:29:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=0fgpeD/ja4yDXXHcFKfwsJTfWbMXlmisFKpirLt9ykE=; b=I1FltWQtPRtdZ8ZIdblXYGXMisjy01hKHpJ/v2aX4QZwsGdLq/tQaJ9wAzTIuZGGou QhpfUBUZCqVMjerNsCvxekLMpU7Ohe5aJGmwBXjHtUXQxCCQnR54iqnXXdIw8caDd+2c Kjrzq+aR6QJMgqy5TCoOFN6mumYb34K3N8g9KLU4EAr5m/3gi8bYxMgbRuUdGCWjjy5W JIkR62IVTkj4nCEgFiUhr32e6bIaUGIydV/bMItGmvqubzh4rna0kchY5vcQ//8F9cw+ aRt/gnHlRXfqOO5n0URsG+EX4cH7lWYJYDd95uLdn7ObT/eFi+x9TxPuWKxIcNmDhN36 AdQg== Received: by 10.66.88.136 with SMTP id bg8mr7708441pab.54.1352305772757; Wed, 07 Nov 2012 08:29:32 -0800 (PST) Received: from localhost.localdomain (bb116-14-119-144.singnet.com.sg. [116.14.119.144]) by mx.google.com with ESMTPS id rk17sm2964228pbb.3.2012.11.07.08.29.29 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 08:29:31 -0800 (PST) From: Daniel J Blueman To: David Airlie Subject: [PATCH, RESEND] nouveau: Prevent kernel log mangling Date: Thu, 8 Nov 2012 00:29:20 +0800 Message-Id: <1352305760-3584-1-git-send-email-daniel@quora.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmzmd/tO7KdpvXOcVxN4bTd7a96GfNYNu4eZv8Pg+Z66ZMvFjC7cmi0WDHux9msAZT78/ux X-Mailman-Approved-At: Wed, 07 Nov 2012 23:23:17 -0800 Cc: Daniel J Blueman , Ben Skeggs , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.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: , MIME-Version: 1.0 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 On 3.7-rc4, add missing newline to to prevent the following kernel log line getting appended to the current one after switching the integrated GPU and suspending the discrete GPU. Signed-off-by: Daniel J Blueman --- drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c index fe1ebf1..dc27e79 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c @@ -50,7 +50,7 @@ auxch_init(struct nouveau_i2c *aux, int ch) ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); udelay(1); if (!timeout--) { - AUX_ERR("begin idle timeout 0x%08x", ctrl); + AUX_ERR("begin idle timeout 0x%08x\n", ctrl); return -EBUSY; } } while (ctrl & 0x03010000);