Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 12:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: spi_flash_free()

Browse source 
dfu_free_entities() invoking dfu_free_entity_sf() has let to segementation
faults due to double freeing the same device.

spi_flash_free() is not relevant for the driver model but exists only for
compatibility with old drivers.

We must not remove any device here:

* The device may still be referenced.
* We don't want to have to probe again.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2021-03-10 18:23:57 +01:00 • committed by Simon Glass
parent 619a81516d
commit b09c74f66d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mtd/spi/sf-uclass.c
View file

@ -46,11 +46,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
return dev_get_uclass_priv(dev); return dev_get_uclass_priv(dev);
} }
void spi_flash_free(struct spi_flash *flash)
{
device_remove(flash->spi->dev, DM_REMOVE_NORMAL);
}
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode, unsigned int max_hz, unsigned int spi_mode,
struct udevice **devp) struct udevice **devp)

4
include/spi_flash.h
View file

@ -97,7 +97,9 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode); unsigned int max_hz, unsigned int spi_mode);
/* Compatibility function - this is the old U-Boot API */ /* Compatibility function - this is the old U-Boot API */
void spi_flash_free(struct spi_flash *flash); static inline void spi_flash_free(struct spi_flash *flash)
{
}
static inline int spi_flash_read(struct spi_flash *flash, u32 offset, static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
size_t len, void *buf) size_t len, void *buf)