From patchwork Sat Nov 24 02:11:46 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: 1802121 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 EDEE43FC23 for ; Mon, 26 Nov 2012 12:41:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D8ADE5BF7 for ; Mon, 26 Nov 2012 04:41:29 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-da0-f49.google.com (mail-da0-f49.google.com [209.85.210.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CB33E5F62 for ; Fri, 23 Nov 2012 18:12:28 -0800 (PST) Received: by mail-da0-f49.google.com with SMTP id v40so2961010dad.36 for ; Fri, 23 Nov 2012 18:12:28 -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=4jlaaBk5ikVM4gK3avxnG1mgowu3ciobA/F5fVIBmgA=; b=CMyYdYZ+m1WAE1BtxpqU7PHy8L9SG5h5dtmVAHM1J3fMu4Ekr3W6M7yFVOgZoJcSkM 6Utb4JQF8ep4Fu4iXxtJ+r4B3tkWLgkTlpYfdOnm8iOacu66YwffUaj9d3VLGFGzpZA0 8zZb+FQEcEMqpCx36yYR7sBGFaHp0BhqSoYS6r+Se1MJbEsOIcEbP+vX2k1WzNRuntBa Br5A76PSKim8rrl157gpjM0gL67A2zVAMz3tavD46b8r4jZei7faIxcDkvUIHlAqPXAG WIKZnW61uUUmbnQQWbhqiK9DiPvrnLIGpwcmmcom/D4prgHxNrACwDZ1bHNK9HxqG+Fj EG2w== Received: by 10.68.132.197 with SMTP id ow5mr19126136pbb.40.1353723148539; Fri, 23 Nov 2012 18:12:28 -0800 (PST) Received: from localhost.localdomain (bb220-255-156-126.singnet.com.sg. [220.255.156.126]) by mx.google.com with ESMTPS id mt15sm4664239pbc.49.2012.11.23.18.12.25 (version=SSLv3 cipher=OTHER); Fri, 23 Nov 2012 18:12:27 -0800 (PST) From: Daniel J Blueman To: nouveau@lists.freedesktop.org Subject: [PATCH] drm/nouveau: prevent log mangling Date: Sat, 24 Nov 2012 10:11:46 +0800 Message-Id: <1353723106-2534-1-git-send-email-daniel@quora.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmCeE3Ptla/lA5S1+744OVBy4CrlqfnDcnSMuvqNKm5/Y2kHpd9wWbXbbyGMVgK3NCsQJsu X-Mailman-Approved-At: Sun, 25 Nov 2012 12:22:00 -0800 Cc: Daniel J Blueman , Ben Skeggs , 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: , 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-rc6, 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);