diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-30 15:00:39 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-30 15:00:39 +0100 |
commit | 7ab004dbcbee38b8a70798835d3ffcd97a985a5e (patch) | |
tree | 0caa6cb97801736046823ca785a5ba36bf684ac6 /drivers/misc | |
parent | eeprom: at25: Replace strncpy() with strscpy() (diff) | |
parent | Linux 5.17-rc2 (diff) | |
download | linux-7ab004dbcbee38b8a70798835d3ffcd97a985a5e.tar.xz linux-7ab004dbcbee38b8a70798835d3ffcd97a985a5e.zip |
Merge tag 'v5.17-rc2' into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/eeprom/at25.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index ecaae1550cb9..91f96abbb3f9 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -440,6 +440,10 @@ static int at25_probe(struct spi_device *spi) return -ENXIO; } + at25 = devm_kzalloc(&spi->dev, sizeof(*at25), GFP_KERNEL); + if (!at25) + return -ENOMEM; + mutex_init(&at25->lock); at25->spi = spi; spi_set_drvdata(spi, at25); |