ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Browse Source 
Pull MTD fixes from Miquel Raynal:

 - cfi: Allow building spi-intel standalone to avoid build issues

 - parsers: scpart: Fix __udivdi3 undefined on mips

 - parsers: tplink_safeloader: Fix potential memory leak during parsing

 - Update email of Tudor Ambarus

* tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  MAINTAINERS: Update email of Tudor Ambarus
  mtd: cfi: allow building spi-intel standalone
  mtd: parsers: scpart: fix __udivdi3 undefined on mips
  mtd: parsers: Fix potential memory leak in mtd_parser_tplink_safeloader_parse()
This commit is contained in:
Linus Torvalds
2023-01-12 05:56:06 -06:00
parent 23025cbcca c0f7ae2753
commit e58f087e9c
14 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@@ -422,6 +422,7 @@ Tony Luck <tony.luck@intel.com>
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org> TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn> TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws> Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com> Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

2
Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml
View File

@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator
maintainers: maintainers:
- Tudor Ambarus <tudor.ambarus@microchip.com> - Tudor Ambarus <tudor.ambarus@linaro.org>
properties: properties:
compatible: compatible:

2
Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml
View File

@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator
maintainers: maintainers:
- Tudor Ambarus <tudor.ambarus@microchip.com> - Tudor Ambarus <tudor.ambarus@linaro.org>
properties: properties:
compatible: compatible:

2
Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml
View File

@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Atmel Triple Data Encryption Standard (TDES) HW cryptographic accelerator title: Atmel Triple Data Encryption Standard (TDES) HW cryptographic accelerator
maintainers: maintainers:
- Tudor Ambarus <tudor.ambarus@microchip.com> - Tudor Ambarus <tudor.ambarus@linaro.org>
properties: properties:
compatible: compatible:

2
Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml
View File

@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Atmel SPI device title: Atmel SPI device
maintainers: maintainers:
- Tudor Ambarus <tudor.ambarus@microchip.com> - Tudor Ambarus <tudor.ambarus@linaro.org>
allOf: allOf:
- $ref: spi-controller.yaml# - $ref: spi-controller.yaml#

2
Documentation/devicetree/bindings/spi/atmel,quadspi.yaml
View File

@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Atmel Quad Serial Peripheral Interface (QSPI) title: Atmel Quad Serial Peripheral Interface (QSPI)
maintainers: maintainers:
- Tudor Ambarus <tudor.ambarus@microchip.com> - Tudor Ambarus <tudor.ambarus@linaro.org>
allOf: allOf:
- $ref: spi-controller.yaml# - $ref: spi-controller.yaml#

10
MAINTAINERS
View File

@@ -13620,7 +13620,7 @@ F: arch/microblaze/
MICROCHIP AT91 DMA DRIVERS MICROCHIP AT91 DMA DRIVERS
M: Ludovic Desroches <ludovic.desroches@microchip.com> M: Ludovic Desroches <ludovic.desroches@microchip.com>
M: Tudor Ambarus <tudor.ambarus@microchip.com> M: Tudor Ambarus <tudor.ambarus@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: dmaengine@vger.kernel.org L: dmaengine@vger.kernel.org
S: Supported S: Supported
@@ -13665,7 +13665,7 @@ F: Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
F: drivers/media/platform/microchip/microchip-csi2dc.c F: drivers/media/platform/microchip/microchip-csi2dc.c
MICROCHIP ECC DRIVER MICROCHIP ECC DRIVER
M: Tudor Ambarus <tudor.ambarus@microchip.com> M: Tudor Ambarus <tudor.ambarus@linaro.org>
L: linux-crypto@vger.kernel.org L: linux-crypto@vger.kernel.org
S: Maintained S: Maintained
F: drivers/crypto/atmel-ecc.* F: drivers/crypto/atmel-ecc.*
@@ -13762,7 +13762,7 @@ S: Maintained
F: drivers/mmc/host/atmel-mci.c F: drivers/mmc/host/atmel-mci.c
MICROCHIP NAND DRIVER MICROCHIP NAND DRIVER
M: Tudor Ambarus <tudor.ambarus@microchip.com> M: Tudor Ambarus <tudor.ambarus@linaro.org>
L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org
S: Supported S: Supported
F: Documentation/devicetree/bindings/mtd/atmel-nand.txt F: Documentation/devicetree/bindings/mtd/atmel-nand.txt
@@ -13814,7 +13814,7 @@ S: Supported
F: drivers/power/reset/at91-sama5d2_shdwc.c F: drivers/power/reset/at91-sama5d2_shdwc.c
MICROCHIP SPI DRIVER MICROCHIP SPI DRIVER
M: Tudor Ambarus <tudor.ambarus@microchip.com> M: Tudor Ambarus <tudor.ambarus@linaro.org>
S: Supported S: Supported
F: drivers/spi/spi-atmel.* F: drivers/spi/spi-atmel.*
@@ -19672,7 +19672,7 @@ F: drivers/clk/spear/
F: drivers/pinctrl/spear/ F: drivers/pinctrl/spear/
SPI NOR SUBSYSTEM SPI NOR SUBSYSTEM
M: Tudor Ambarus <tudor.ambarus@microchip.com> M: Tudor Ambarus <tudor.ambarus@linaro.org>
M: Pratyush Yadav <pratyush@kernel.org> M: Pratyush Yadav <pratyush@kernel.org>
R: Michael Walle <michael@walle.cc> R: Michael Walle <michael@walle.cc>
L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org

4
drivers/crypto/atmel-ecc.c
View File

@@ -3,7 +3,7 @@
* Microchip / Atmel ECC (I2C) driver. * Microchip / Atmel ECC (I2C) driver.
* *
* Copyright (c) 2017, Microchip Technology Inc. * Copyright (c) 2017, Microchip Technology Inc.
* Author: Tudor Ambarus <tudor.ambarus@microchip.com> * Author: Tudor Ambarus
*/ */
#include <linux/delay.h> #include <linux/delay.h>
@@ -411,6 +411,6 @@ static void __exit atmel_ecc_exit(void)
module_init(atmel_ecc_init); module_init(atmel_ecc_init);
module_exit(atmel_ecc_exit); module_exit(atmel_ecc_exit);
MODULE_AUTHOR("Tudor Ambarus <tudor.ambarus@microchip.com>"); MODULE_AUTHOR("Tudor Ambarus");
MODULE_DESCRIPTION("Microchip / Atmel ECC (I2C) driver"); MODULE_DESCRIPTION("Microchip / Atmel ECC (I2C) driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

4
drivers/crypto/atmel-i2c.c
View File

@@ -3,7 +3,7 @@
* Microchip / Atmel ECC (I2C) driver. * Microchip / Atmel ECC (I2C) driver.
* *
* Copyright (c) 2017, Microchip Technology Inc. * Copyright (c) 2017, Microchip Technology Inc.
* Author: Tudor Ambarus <tudor.ambarus@microchip.com> * Author: Tudor Ambarus
*/ */
#include <linux/bitrev.h> #include <linux/bitrev.h>
@@ -390,6 +390,6 @@ static void __exit atmel_i2c_exit(void)
module_init(atmel_i2c_init); module_init(atmel_i2c_init);
module_exit(atmel_i2c_exit); module_exit(atmel_i2c_exit);
MODULE_AUTHOR("Tudor Ambarus <tudor.ambarus@microchip.com>"); MODULE_AUTHOR("Tudor Ambarus");
MODULE_DESCRIPTION("Microchip / Atmel ECC (I2C) driver"); MODULE_DESCRIPTION("Microchip / Atmel ECC (I2C) driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

2
drivers/crypto/atmel-i2c.h
View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (c) 2017, Microchip Technology Inc. * Copyright (c) 2017, Microchip Technology Inc.
* Author: Tudor Ambarus <tudor.ambarus@microchip.com> * Author: Tudor Ambarus
*/ */
#ifndef __ATMEL_I2C_H__ #ifndef __ATMEL_I2C_H__

2
drivers/mtd/parsers/scpart.c
View File

@@ -50,7 +50,7 @@ static int scpart_scan_partmap(struct mtd_info *master, loff_t partmap_offs,
int cnt = 0; int cnt = 0;
int res = 0; int res = 0;
int res2; int res2;
loff_t offs; uint32_t offs;
size_t retlen; size_t retlen;
struct sc_part_desc *pdesc = NULL; struct sc_part_desc *pdesc = NULL;
struct sc_part_desc *tmpdesc; struct sc_part_desc *tmpdesc;

4
drivers/mtd/parsers/tplink_safeloader.c
View File

@@ -91,7 +91,7 @@ static int mtd_parser_tplink_safeloader_parse(struct mtd_info *mtd,
buf = mtd_parser_tplink_safeloader_read_table(mtd); buf = mtd_parser_tplink_safeloader_read_table(mtd);
if (!buf) { if (!buf) {
err = -ENOENT; err = -ENOENT;
goto err_out; goto err_free_parts;
} }
for (idx = 0, offset = TPLINK_SAFELOADER_DATA_OFFSET; for (idx = 0, offset = TPLINK_SAFELOADER_DATA_OFFSET;
@@ -118,6 +118,8 @@ static int mtd_parser_tplink_safeloader_parse(struct mtd_info *mtd,
err_free: err_free:
for (idx -= 1; idx >= 0; idx--) for (idx -= 1; idx >= 0; idx--)
kfree(parts[idx].name); kfree(parts[idx].name);
err_free_parts:
kfree(parts);
err_out: err_out:
return err; return err;
}; };

1
drivers/mtd/spi-nor/core.c
View File

@@ -10,6 +10,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/math64.h> #include <linux/math64.h>

1
include/linux/mtd/spi-nor.h
View File

@@ -7,7 +7,6 @@
#define __LINUX_MTD_SPI_NOR_H #define __LINUX_MTD_SPI_NOR_H
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mtd/cfi.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/spi/spi-mem.h> #include <linux/spi/spi-mem.h>