diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-31 17:38:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-31 17:38:02 -0400 |
| commit | 7967290f519ea6d3bb1272601210e8388f2658f7 (patch) | |
| tree | f5ff4b95ab0ee1853f57353dabecde12c45b5844 /drivers | |
| parent | 877294b56a52f1cb60bbfa7e4722fcc33451f7b2 (diff) | |
| parent | 47e8ee6b39a47dc0bbde43049dc83dbc48dcdb56 (diff) | |
Merge branch '2019-08-30-master-imports'
- Assorted bug fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/blk-uclass.c | 14 | ||||
| -rw-r--r-- | drivers/mmc/mmc-uclass.c | 7 |
2 files changed, 8 insertions, 13 deletions
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index c23b6682a6c..baaf431e5e0 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -208,11 +208,7 @@ int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart) if (ret) return ret; - ret = blk_select_hwpart(dev, hwpart); - if (!ret) - blkcache_invalidate(if_type, devnum); - - return ret; + return blk_select_hwpart(dev, hwpart); } int blk_list_part(enum if_type if_type) @@ -352,13 +348,7 @@ int blk_select_hwpart(struct udevice *dev, int hwpart) int blk_dselect_hwpart(struct blk_desc *desc, int hwpart) { - int ret; - - ret = blk_select_hwpart(desc->bdev, hwpart); - if (!ret) - blkcache_invalidate(desc->if_type, desc->devnum); - - return ret; + return blk_select_hwpart(desc->bdev, hwpart); } int blk_first_device(int if_type, struct udevice **devp) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 551007905c3..2b146ea43c5 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -360,6 +360,7 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart) struct udevice *mmc_dev = dev_get_parent(bdev); struct mmc *mmc = mmc_get_mmc_dev(mmc_dev); struct blk_desc *desc = dev_get_uclass_platdata(bdev); + int ret; if (desc->hwpart == hwpart) return 0; @@ -367,7 +368,11 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart) if (mmc->part_config == MMCPART_NOAVAILABLE) return -EMEDIUMTYPE; - return mmc_switch_part(mmc, hwpart); + ret = mmc_switch_part(mmc, hwpart); + if (!ret) + blkcache_invalidate(desc->if_type, desc->devnum); + + return ret; } static int mmc_blk_probe(struct udevice *dev) |