aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel J Blueman <daniel@quora.org>2012-11-23 21:11:46 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-11-28 18:58:12 -0500
commitc9aa763fe9690a334d0636f88e6eb85340f36f89 (patch)
tree2df7664a8be1f5f3e49260b7a1c426fafb5576ed
parent04c8c21085e13011a2eaf3ae518ab44e23e21917 (diff)
drm/nouveau: prevent log mangling
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 <daniel@quora.org> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c
index fe1ebf199ba9..dc27e794a851 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)
50 ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); 50 ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));
51 udelay(1); 51 udelay(1);
52 if (!timeout--) { 52 if (!timeout--) {
53 AUX_ERR("begin idle timeout 0x%08x", ctrl); 53 AUX_ERR("begin idle timeout 0x%08x\n", ctrl);
54 return -EBUSY; 54 return -EBUSY;
55 } 55 }
56 } while (ctrl & 0x03010000); 56 } while (ctrl & 0x03010000);