diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 17:05:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 17:05:30 -0700 |
| commit | 16bf8348055fe4615bd08ef50f9874f5dcc10268 (patch) | |
| tree | 5b693edb74cb8e2a18b78f7a5cb8d9d9ce6ebafa /drivers/memstick/core/ms_block.c | |
| parent | a7fd20d1c476af4563e66865213474a2f9f473a4 (diff) | |
| parent | 52bbe141f37f093e2c612e97c40d27422e5a1fdf (diff) | |
| download | linux-16bf8348055fe4615bd08ef50f9874f5dcc10268.tar.gz linux-16bf8348055fe4615bd08ef50f9874f5dcc10268.tar.bz2 linux-16bf8348055fe4615bd08ef50f9874f5dcc10268.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (21 commits)
gitignore: fix wording
mfd: ab8500-debugfs: fix "between" in printk
memstick: trivial fix of spelling mistake on management
cpupowerutils: bench: fix "average"
treewide: Fix typos in printk
IB/mlx4: printk fix
pinctrl: sirf/atlas7: fix printk spelling
serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/
w1: comment spelling s/minmum/minimum/
Blackfin: comment spelling s/divsor/divisor/
metag: Fix misspellings in comments.
ia64: Fix misspellings in comments.
hexagon: Fix misspellings in comments.
tools/perf: Fix misspellings in comments.
cris: Fix misspellings in comments.
c6x: Fix misspellings in comments.
blackfin: Fix misspelling of 'register' in comment.
avr32: Fix misspelling of 'definitions' in comment.
treewide: Fix typos in printk
Doc: treewide : Fix typos in DocBook/filesystem.xml
...
Diffstat (limited to 'drivers/memstick/core/ms_block.c')
| -rw-r--r-- | drivers/memstick/core/ms_block.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 84abf9d3c24e..3cd68152ddf8 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -1220,7 +1220,7 @@ static int msb_read_boot_blocks(struct msb_data *msb) } if (extra.management_flag & MEMSTICK_MANAGEMENT_SYSFLG) { - dbg("managment flag doesn't indicate boot block %d", + dbg("management flag doesn't indicate boot block %d", pba); continue; } @@ -1367,7 +1367,7 @@ static int msb_ftl_initialize(struct msb_data *msb) static int msb_ftl_scan(struct msb_data *msb) { u16 pba, lba, other_block; - u8 overwrite_flag, managment_flag, other_overwrite_flag; + u8 overwrite_flag, management_flag, other_overwrite_flag; int error; struct ms_extra_data_register extra; u8 *overwrite_flags = kzalloc(msb->block_count, GFP_KERNEL); @@ -1409,7 +1409,7 @@ static int msb_ftl_scan(struct msb_data *msb) } lba = be16_to_cpu(extra.logical_address); - managment_flag = extra.management_flag; + management_flag = extra.management_flag; overwrite_flag = extra.overwrite_flag; overwrite_flags[pba] = overwrite_flag; @@ -1421,16 +1421,16 @@ static int msb_ftl_scan(struct msb_data *msb) } /* Skip system/drm blocks */ - if ((managment_flag & MEMSTICK_MANAGMENT_FLAG_NORMAL) != - MEMSTICK_MANAGMENT_FLAG_NORMAL) { - dbg("pba %05d -> [reserved managment flag %02x]", - pba, managment_flag); + if ((management_flag & MEMSTICK_MANAGEMENT_FLAG_NORMAL) != + MEMSTICK_MANAGEMENT_FLAG_NORMAL) { + dbg("pba %05d -> [reserved management flag %02x]", + pba, management_flag); msb_mark_block_used(msb, pba); continue; } /* Erase temporary tables */ - if (!(managment_flag & MEMSTICK_MANAGEMENT_ATFLG)) { + if (!(management_flag & MEMSTICK_MANAGEMENT_ATFLG)) { dbg("pba %05d -> [temp table] - will erase", pba); msb_mark_block_used(msb, pba); |