* [PATCH 1/2] trivial: fix spelling in usb code
2012-08-30 11:13 [PATCH 0/2] trivial: correct spellings and grammar Steffen Trumtrar
@ 2012-08-30 11:13 ` Steffen Trumtrar
2012-08-30 11:14 ` [PATCH 2/2] trivial: bootm: correct grammar in error message Steffen Trumtrar
2012-08-31 7:26 ` [PATCH 0/2] trivial: correct spellings and grammar Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Steffen Trumtrar @ 2012-08-30 11:13 UTC (permalink / raw)
To: barebox; +Cc: Steffen Trumtrar
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
commands/usb.c | 2 +-
drivers/usb/core/usb.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/commands/usb.c b/commands/usb.c
index d02ea4b..729a402 100644
--- a/commands/usb.c
+++ b/commands/usb.c
@@ -50,7 +50,7 @@ static int do_usb(int argc, char *argv[])
BAREBOX_CMD_HELP_START(usb)
BAREBOX_CMD_HELP_USAGE("usb [-f]\n")
BAREBOX_CMD_HELP_SHORT("Scan for USB devices.\n")
-BAREBOX_CMD_HELP_OPT("-f", "force. Rescan if if if have scanned once\n")
+BAREBOX_CMD_HELP_OPT("-f", "force. Rescan although scanned already\n")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(usb)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index a5075d5..81ae9f1 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -528,10 +528,10 @@ int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
}
/*
- * submits a control message and waits for comletion (at least timeout * 1ms)
+ * submits a control message and waits for completion (at least timeout * 1ms)
* If timeout is 0, we don't wait for completion (used as example to set and
* clear keyboards LEDs). For data transfers, (storage transfers) we don't
- * allow control messages with 0 timeout, by previousely resetting the flag
+ * allow control messages with 0 timeout, by previously resetting the flag
* asynch_allowed (usb_disable_asynch(1)).
* returns the transfered length if OK or -1 if error. The transfered length
* and the current status are stored in the dev->act_len and dev->status.
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] trivial: bootm: correct grammar in error message
2012-08-30 11:13 [PATCH 0/2] trivial: correct spellings and grammar Steffen Trumtrar
2012-08-30 11:13 ` [PATCH 1/2] trivial: fix spelling in usb code Steffen Trumtrar
@ 2012-08-30 11:14 ` Steffen Trumtrar
2012-08-31 7:26 ` [PATCH 0/2] trivial: correct spellings and grammar Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Steffen Trumtrar @ 2012-08-30 11:14 UTC (permalink / raw)
To: barebox; +Cc: Steffen Trumtrar
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
commands/bootm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commands/bootm.c b/commands/bootm.c
index 5f858e8..2d9f7f2 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -180,7 +180,7 @@ static int bootm_open_oftree(struct image_data *data, const char *oftree, int nu
ft = file_detect_type(fdt);
if (ft != filetype_oftree) {
- printf("%s is not a oftree but %s\n", oftree,
+ printf("%s is not an oftree but %s\n", oftree,
file_type_to_string(ft));
}
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] trivial: correct spellings and grammar
2012-08-30 11:13 [PATCH 0/2] trivial: correct spellings and grammar Steffen Trumtrar
2012-08-30 11:13 ` [PATCH 1/2] trivial: fix spelling in usb code Steffen Trumtrar
2012-08-30 11:14 ` [PATCH 2/2] trivial: bootm: correct grammar in error message Steffen Trumtrar
@ 2012-08-31 7:26 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2012-08-31 7:26 UTC (permalink / raw)
To: Steffen Trumtrar; +Cc: barebox
On Thu, Aug 30, 2012 at 01:13:58PM +0200, Steffen Trumtrar wrote:
> Hi all,
>
> this patchseries fixes just some spelling, grammar, etc errors I
> stumbled upon.
>
> Steffen Trumtrar (2):
> trivial: fix spelling in usb code
> trivial: bootm: correct grammar in error message
Applied, thanks
Sascha
>
> commands/bootm.c | 2 +-
> commands/usb.c | 2 +-
> drivers/usb/core/usb.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread