diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:10 +0800 |
| commit | e0d60977f25c7a33b2acda240a1d121bf0a35deb (patch) | |
| tree | 4f930533fa1e36e0ec75ee8bcaa82d2320985a2c /drivers/mtd | |
| parent | 4304568925f8191755da36df5c61abb69db9b1b0 (diff) | |
| parent | 1c563c0006661025d7a6c9bc85fc889a4e8a1c06 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.03-android
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/pmcmsp-flash.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index f9fa3fad728e..2051f28ddac6 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c @@ -139,15 +139,13 @@ static int __init init_msp_flash(void) } msp_maps[i].bankwidth = 1; - msp_maps[i].name = kmalloc(7, GFP_KERNEL); + msp_maps[i].name = kstrndup(flash_name, 7, GFP_KERNEL); if (!msp_maps[i].name) { iounmap(msp_maps[i].virt); kfree(msp_parts[i]); goto cleanup_loop; } - msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7); - for (j = 0; j < pcnt; j++) { part_name[5] = '0' + i; part_name[7] = '0' + j; |