public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] Staging: adl_pci9118: a style issue fixed
@ 2014-07-16 22:26 Sam Asadi
  2014-07-18  1:03 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Sam Asadi @ 2014-07-16 22:26 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Sam Asadi

a 'quoted string split across lines' fixed while better use of
English applied to the text.

Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
---
 drivers/staging/comedi/drivers/adl_pci9118.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 93bd9ee..7365f31 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -418,8 +418,7 @@ static int check_channel_list(struct comedi_device *dev,
 			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
 			    (bipolar)) {
 				comedi_error(dev,
-					     "Bipolar and unipolar ranges "
-							"can't be mixtured!");
+					     "Bipolar and unipolar ranges can't be mixed!");
 				return 0;
 			}
 			if (!devpriv->usemux && differencial &&
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] Staging: adl_pci9118: a style issue fixed
  2014-07-16 22:26 [PATCH 1/1] Staging: adl_pci9118: a style issue fixed Sam Asadi
@ 2014-07-18  1:03 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2014-07-18  1:03 UTC (permalink / raw)
  To: Sam Asadi; +Cc: devel, linux-kernel

On Thu, Jul 17, 2014 at 01:26:23AM +0300, Sam Asadi wrote:
> a 'quoted string split across lines' fixed while better use of
> English applied to the text.
> 
> Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
> ---
>  drivers/staging/comedi/drivers/adl_pci9118.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
> index 93bd9ee..7365f31 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9118.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9118.c
> @@ -418,8 +418,7 @@ static int check_channel_list(struct comedi_device *dev,
>  			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
>  			    (bipolar)) {
>  				comedi_error(dev,
> -					     "Bipolar and unipolar ranges "
> -							"can't be mixtured!");
> +					     "Bipolar and unipolar ranges can't be mixed!");
>  				return 0;
>  			}
>  			if (!devpriv->usemux && differencial &&
> -- 
> 1.7.10.4

This patch doesn't apply to my tree due to other changes in this same
file.  Can you please refresh it and resend?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-18  1:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-16 22:26 [PATCH 1/1] Staging: adl_pci9118: a style issue fixed Sam Asadi
2014-07-18  1:03 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox