Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758001AbZFWGMs (ORCPT ); Tue, 23 Jun 2009 02:12:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752910AbZFWGMl (ORCPT ); Tue, 23 Jun 2009 02:12:41 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:36070 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752250AbZFWGMk (ORCPT ); Tue, 23 Jun 2009 02:12:40 -0400 Date: Mon, 22 Jun 2009 23:11:31 -0700 From: Andrew Morton To: Mikael Pettersson Cc: linux-fbdev-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2.6.30] nvidiafb: fix missing space in log message Message-Id: <20090622231131.772eea06.akpm@linux-foundation.org> In-Reply-To: <18999.49010.127368.554600@pilspetsen.it.uu.se> References: <18999.49010.127368.554600@pilspetsen.it.uu.se> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2215 Lines: 62 On Tue, 16 Jun 2009 17:51:14 +0200 Mikael Pettersson wrote: > On bootup nvidiafb prints the following on my Apple G5: > > nvidiafb: CRTC 1appears to have a CRT attached > > There should be a space between the '1' and the 'appears'. > > Fix: add the space > > Signed-off-by: Mikael Pettersson > > diff -rupN linux-2.6.30/drivers/video/nvidia/nv_setup.c linux-2.6.30.nvidiafb-logmsg-missing-space/drivers/video/nvidia/nv_setup.c > --- linux-2.6.30/drivers/video/nvidia/nv_setup.c 2009-06-10 12:00:46.000000000 +0200 > +++ linux-2.6.30.nvidiafb-logmsg-missing-space/drivers/video/nvidia/nv_setup.c 2009-06-16 17:41:21.000000000 +0200 > @@ -543,7 +543,7 @@ int NVCommonSetup(struct fb_info *info) > } else if (analog_on_B) { > CRTCnumber = outputBfromCRTC; > FlatPanel = 0; > - printk("nvidiafb: CRTC %i" > + printk("nvidiafb: CRTC %i " > "appears to have a " > "CRT attached\n", CRTCnumber); > } else if (slaved_on_A) { Yeah, someone seems to have gone checkpatch-crazy there. Let's be slightly less nutty and do --- a/drivers/video/nvidia/nv_setup.c~nvidiafb-fix-missing-space-in-log-message +++ a/drivers/video/nvidia/nv_setup.c @@ -543,8 +543,7 @@ int NVCommonSetup(struct fb_info *info) } else if (analog_on_B) { CRTCnumber = outputBfromCRTC; FlatPanel = 0; - printk("nvidiafb: CRTC %i" - "appears to have a " + printk("nvidiafb: CRTC %i appears to have a " "CRT attached\n", CRTCnumber); } else if (slaved_on_A) { CRTCnumber = 0; _ Which happens to exactly copy the printk from five lines earlier... } else if (analog_on_A) { CRTCnumber = outputAfromCRTC; FlatPanel = 0; printk("nvidiafb: CRTC %i appears to have a " "CRT attached\n", CRTCnumber); } else if (analog_on_B) { CRTCnumber = outputBfromCRTC; FlatPanel = 0; printk("nvidiafb: CRTC %i appears to have a " "CRT attached\n", CRTCnumber); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/