diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 11:20:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 11:20:04 +1100 |
| commit | e59d4297d79533d8c9cb04c7a236cf21ff5851a8 (patch) | |
| tree | 0de3f064e9d48899e331f88c9636fb90b49f1847 /drivers | |
| parent | e5550b5eaf7b9d15acb982188af18fb9e5ed2565 (diff) | |
| parent | 472247d323153395f392ff2bfcf796f0f51890fe (diff) | |
Merge remote-tracking branch 'spi-nor/spi-nor/next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index eb7bb596416b..00f0b6b69b62 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -3039,7 +3039,7 @@ static int spi_nor_parse_smpt(struct spi_nor *nor, /* Read the Sector Map Parameter Table. */ len = smpt_header->length * sizeof(*smpt); - smpt = kzalloc(len, GFP_KERNEL); + smpt = kmalloc(len, GFP_KERNEL); if (!smpt) return -ENOMEM; |