* [PATCH] [trivial] zd1211rw: Fix typo in zd_usb.c and zd_mac.c
@ 2012-02-09 15:29 Masanari Iida
2012-02-22 19:30 ` John W. Linville
0 siblings, 1 reply; 3+ messages in thread
From: Masanari Iida @ 2012-02-09 15:29 UTC (permalink / raw)
To: dsd, kune, linux-wireless; +Cc: standby24x7, trivial, linux-kernel
Correct spelling "reseting" to "resetting" in
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_mac.c
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
---
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 0a70149..a8370eb 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -846,7 +846,7 @@ reset_device:
/* semaphore stuck, reset device to avoid fw freeze later */
dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, "
- "reseting device...");
+ "resetting device...");
usb_queue_reset_device(mac->chip.usb.intf);
return r;
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 785bdbe..f766b3e 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1104,7 +1104,7 @@ static void zd_tx_watchdog_handler(struct work_struct *work)
goto out;
/* TX halted, try reset */
- dev_warn(zd_usb_dev(usb), "TX-stall detected, reseting device...");
+ dev_warn(zd_usb_dev(usb), "TX-stall detected, resetting device...");
usb_queue_reset_device(usb->intf);
--
1.7.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] [trivial] zd1211rw: Fix typo in zd_usb.c and zd_mac.c
2012-02-09 15:29 [PATCH] [trivial] zd1211rw: Fix typo in zd_usb.c and zd_mac.c Masanari Iida
@ 2012-02-22 19:30 ` John W. Linville
2012-02-22 20:03 ` John W. Linville
0 siblings, 1 reply; 3+ messages in thread
From: John W. Linville @ 2012-02-22 19:30 UTC (permalink / raw)
To: Masanari Iida; +Cc: dsd, kune, linux-wireless, trivial, linux-kernel
NAK
http://mw1.merriam-webster.com/dictionary/resetting
On Fri, Feb 10, 2012 at 12:29:32AM +0900, Masanari Iida wrote:
> Correct spelling "reseting" to "resetting" in
> drivers/net/wireless/zd1211rw/zd_usb.c
> drivers/net/wireless/zd1211rw/zd_mac.c
>
> Signed-off-by: Masanari Iida <standby24x7@gmail.com>
> ---
> drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
> drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
> index 0a70149..a8370eb 100644
> --- a/drivers/net/wireless/zd1211rw/zd_mac.c
> +++ b/drivers/net/wireless/zd1211rw/zd_mac.c
> @@ -846,7 +846,7 @@ reset_device:
>
> /* semaphore stuck, reset device to avoid fw freeze later */
> dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, "
> - "reseting device...");
> + "resetting device...");
> usb_queue_reset_device(mac->chip.usb.intf);
>
> return r;
> diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
> index 785bdbe..f766b3e 100644
> --- a/drivers/net/wireless/zd1211rw/zd_usb.c
> +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
> @@ -1104,7 +1104,7 @@ static void zd_tx_watchdog_handler(struct work_struct *work)
> goto out;
>
> /* TX halted, try reset */
> - dev_warn(zd_usb_dev(usb), "TX-stall detected, reseting device...");
> + dev_warn(zd_usb_dev(usb), "TX-stall detected, resetting device...");
>
> usb_queue_reset_device(usb->intf);
>
> --
> 1.7.6.5
>
> --
> 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/
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [trivial] zd1211rw: Fix typo in zd_usb.c and zd_mac.c
2012-02-22 19:30 ` John W. Linville
@ 2012-02-22 20:03 ` John W. Linville
0 siblings, 0 replies; 3+ messages in thread
From: John W. Linville @ 2012-02-22 20:03 UTC (permalink / raw)
To: Masanari Iida; +Cc: dsd, kune, linux-wireless, trivial, linux-kernel
Sorry, I misread the patch -- I'm having a bad week...
On Wed, Feb 22, 2012 at 02:30:39PM -0500, John W. Linville wrote:
> NAK
>
> http://mw1.merriam-webster.com/dictionary/resetting
>
> On Fri, Feb 10, 2012 at 12:29:32AM +0900, Masanari Iida wrote:
> > Correct spelling "reseting" to "resetting" in
> > drivers/net/wireless/zd1211rw/zd_usb.c
> > drivers/net/wireless/zd1211rw/zd_mac.c
> >
> > Signed-off-by: Masanari Iida <standby24x7@gmail.com>
> > ---
> > drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
> > drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
> > index 0a70149..a8370eb 100644
> > --- a/drivers/net/wireless/zd1211rw/zd_mac.c
> > +++ b/drivers/net/wireless/zd1211rw/zd_mac.c
> > @@ -846,7 +846,7 @@ reset_device:
> >
> > /* semaphore stuck, reset device to avoid fw freeze later */
> > dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, "
> > - "reseting device...");
> > + "resetting device...");
> > usb_queue_reset_device(mac->chip.usb.intf);
> >
> > return r;
> > diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
> > index 785bdbe..f766b3e 100644
> > --- a/drivers/net/wireless/zd1211rw/zd_usb.c
> > +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
> > @@ -1104,7 +1104,7 @@ static void zd_tx_watchdog_handler(struct work_struct *work)
> > goto out;
> >
> > /* TX halted, try reset */
> > - dev_warn(zd_usb_dev(usb), "TX-stall detected, reseting device...");
> > + dev_warn(zd_usb_dev(usb), "TX-stall detected, resetting device...");
> >
> > usb_queue_reset_device(usb->intf);
> >
> > --
> > 1.7.6.5
> >
> > --
> > 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/
> >
>
> --
> John W. Linville Someday the world will need a hero, and you
> linville@tuxdriver.com might be all we have. Be ready.
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-22 20:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-09 15:29 [PATCH] [trivial] zd1211rw: Fix typo in zd_usb.c and zd_mac.c Masanari Iida
2012-02-22 19:30 ` John W. Linville
2012-02-22 20:03 ` John W. Linville
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).