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-sunxi
[oweals/u-boot.git]
/
drivers
/
misc
/
fs_loader.c
diff --git
a/drivers/misc/fs_loader.c
b/drivers/misc/fs_loader.c
index b7bb96a4583e3bee9a2926d038956cffe48fe173..baa5f8302aeb8c050cbbdacf819fc3e02e095e8d 100644
(file)
--- a/
drivers/misc/fs_loader.c
+++ b/
drivers/misc/fs_loader.c
@@
-55,11
+55,9
@@
static int select_fs_dev(struct device_platdata *plat)
node = ofnode_get_by_phandle(plat->phandlepart.phandle);
node = ofnode_get_by_phandle(plat->phandlepart.phandle);
- int of_offset = ofnode_to_offset(node);
-
struct udevice *dev;
struct udevice *dev;
- ret = device_get_global_by_of
_offset(of_offset
, &dev);
+ ret = device_get_global_by_of
node(node
, &dev);
if (!ret) {
struct blk_desc *desc = blk_get_by_device(dev);
if (desc) {
if (!ret) {
struct blk_desc *desc = blk_get_by_device(dev);
if (desc) {
@@
-190,8
+188,9
@@
static int fw_get_filesystem_firmware(struct device_platdata *plat,
ret = fs_read(fw_priv->name, (ulong)map_to_sysmem(firmware->data),
fw_priv->offset, firmware->size, &actread);
ret = fs_read(fw_priv->name, (ulong)map_to_sysmem(firmware->data),
fw_priv->offset, firmware->size, &actread);
+
if (ret) {
if (ret) {
- debug("Error: %d Failed to read %s from flash %lld != %
d
.\n",
+ debug("Error: %d Failed to read %s from flash %lld != %
zu
.\n",
ret, fw_priv->name, actread, firmware->size);
} else {
ret = actread;
ret, fw_priv->name, actread, firmware->size);
} else {
ret = actread;