projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
drivers
/
spi
/
spi-uclass.c
diff --git
a/drivers/spi/spi-uclass.c
b/drivers/spi/spi-uclass.c
index ac17da0777d53a07769da1100e908960fe77405a..c061c05443d442e5a12759d5272b719c559133bb 100644
(file)
--- a/
drivers/spi/spi-uclass.c
+++ b/
drivers/spi/spi-uclass.c
@@
-343,7
+343,7
@@
err:
debug("%s: Error path, created=%d, device '%s'\n", __func__,
created, dev->name);
if (created) {
debug("%s: Error path, created=%d, device '%s'\n", __func__,
created, dev->name);
if (created) {
- device_remove(dev);
+ device_remove(dev
, DM_REMOVE_NORMAL
);
device_unbind(dev);
}
device_unbind(dev);
}
@@
-384,7
+384,7
@@
struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs,
void spi_free_slave(struct spi_slave *slave)
{
void spi_free_slave(struct spi_slave *slave)
{
- device_remove(slave->dev);
+ device_remove(slave->dev
, DM_REMOVE_NORMAL
);
slave->dev = NULL;
}
slave->dev = NULL;
}