diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-14 22:22:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-14 22:22:31 +0200 |
| commit | bbb9e06d2c6435af9c62074ad7048910eeb2e7bc (patch) | |
| tree | 17d152543a602d65c749efaaaaafde24d5fec46c /drivers/mtd/spi-nor/spansion.c | |
| parent | USB: gadget: f_mass_storage: Fix unused variable warning (diff) | |
| parent | Linux 6.5-rc6 (diff) | |
| download | linux-bbb9e06d2c6435af9c62074ad7048910eeb2e7bc.tar.xz linux-bbb9e06d2c6435af9c62074ad7048910eeb2e7bc.zip | |
Merge 6.5-rc6 into usb-next
We need the USB and Thunderbolt fixes in here to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mtd/spi-nor/spansion.c')
| -rw-r--r-- | drivers/mtd/spi-nor/spansion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 36876aa849ed..15f9a80c10b9 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -361,7 +361,7 @@ static int cypress_nor_determine_addr_mode_by_sr1(struct spi_nor *nor, */ static int cypress_nor_set_addr_mode_nbytes(struct spi_nor *nor) { - struct spi_mem_op op = {}; + struct spi_mem_op op; u8 addr_mode; int ret; @@ -492,7 +492,7 @@ s25fs256t_post_bfpt_fixup(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header, const struct sfdp_bfpt *bfpt) { - struct spi_mem_op op = {}; + struct spi_mem_op op; int ret; ret = cypress_nor_set_addr_mode_nbytes(nor); |