diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-05 08:28:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 08:28:33 -0400 |
| commit | 433647a7ef9241b963b4636e7f8c3a2159d156f0 (patch) | |
| tree | 15008cb530f46b5f9711efa2d9fc550b11ce2905 /drivers/mtd/spi | |
| parent | 7da8680b260b4598d841d9a8432d95d56cb86d9f (diff) | |
| parent | 239ae4a9129b8b9f24a216e127042b255b07ae59 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/mtd/spi')
| -rw-r--r-- | drivers/mtd/spi/sandbox.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 36a50fe3a1..a53f4ebc68 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -595,7 +595,7 @@ void sandbox_sf_unbind_emul(struct sandbox_state *state, int busnum, int cs) struct udevice *dev; dev = state->spi[busnum][cs].emul; - device_remove(dev); + device_remove(dev, DM_REMOVE_NORMAL); device_unbind(dev); state->spi[busnum][cs].emul = NULL; } diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 19de964e61..83876485fe 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -46,7 +46,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, void spi_flash_free(struct spi_flash *flash) { - device_remove(flash->spi->dev); + device_remove(flash->spi->dev, DM_REMOVE_NORMAL); } int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, |