diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
| commit | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /drivers/core | |
| parent | 446d37c1acc76680770400fd90e6c502e49d72df (diff) | |
| parent | ac1d31380618f3f68bf7f05b73b6ab0cdeab0e9f (diff) | |
| download | talos-obmc-uboot-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.tar.gz talos-obmc-uboot-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/uclass.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index e800c28653..1af09472a2 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -523,22 +523,15 @@ int uclass_post_probe_device(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) int uclass_pre_remove_device(struct udevice *dev) { - struct uclass_driver *uc_drv; struct uclass *uc; int ret; uc = dev->uclass; - uc_drv = uc->uc_drv; if (uc->uc_drv->pre_remove) { ret = uc->uc_drv->pre_remove(dev); if (ret) return ret; } - if (uc_drv->per_device_auto_alloc_size) { - free(dev->uclass_priv); - dev->uclass_priv = NULL; - } - dev->seq = -1; return 0; } |
