Commit c9aa763f authored Nov 24, 2012 by Daniel J Blueman Committed by Ben Skeggs Nov 29, 2012

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>

parent 04c8c210

drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message