diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /drivers/target/iscsi | |
parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'drivers/target/iscsi')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_parameters.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 0c4760fabfc0..240f7aa76ed1 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c | |||
@@ -662,7 +662,7 @@ int iscsi_extract_key_value(char *textbuf, char **key, char **value) | |||
662 | { | 662 | { |
663 | *value = strchr(textbuf, '='); | 663 | *value = strchr(textbuf, '='); |
664 | if (!*value) { | 664 | if (!*value) { |
665 | pr_err("Unable to locate \"=\" seperator for key," | 665 | pr_err("Unable to locate \"=\" separator for key," |
666 | " ignoring request.\n"); | 666 | " ignoring request.\n"); |
667 | return -1; | 667 | return -1; |
668 | } | 668 | } |
@@ -1269,7 +1269,7 @@ static int iscsi_check_value(struct iscsi_param *param, char *value) | |||
1269 | comma_ptr = strchr(value, ','); | 1269 | comma_ptr = strchr(value, ','); |
1270 | 1270 | ||
1271 | if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) { | 1271 | if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) { |
1272 | pr_err("Detected value seperator \",\", but" | 1272 | pr_err("Detected value separator \",\", but" |
1273 | " key \"%s\" does not allow a value list," | 1273 | " key \"%s\" does not allow a value list," |
1274 | " protocol error.\n", param->name); | 1274 | " protocol error.\n", param->name); |
1275 | return -1; | 1275 | return -1; |