projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: configs: add some devfreq gov for rk3399 linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
fpga
/
fpga-mgr.c
diff --git
a/drivers/fpga/fpga-mgr.c
b/drivers/fpga/fpga-mgr.c
index a24f5cb877e0a2b32fcfccc14b80e01f2028a08d..953dc9195937d39bb1def7c7bfaa3f905f8d4032 100644
(file)
--- a/
drivers/fpga/fpga-mgr.c
+++ b/
drivers/fpga/fpga-mgr.c
@@
-122,12
+122,10
@@
int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags,
}
ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
}
ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
- if (ret)
- return ret;
release_firmware(fw);
release_firmware(fw);
- return
0
;
+ return
ret
;
}
EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);
}
EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);
@@
-256,7
+254,6
@@
int fpga_mgr_register(struct device *dev, const char *name,
void *priv)
{
struct fpga_manager *mgr;
void *priv)
{
struct fpga_manager *mgr;
- const char *dt_label;
int id, ret;
if (!mops || !mops->write_init || !mops->write ||
int id, ret;
if (!mops || !mops->write_init || !mops->write ||
@@
-300,11
+297,9
@@
int fpga_mgr_register(struct device *dev, const char *name,
mgr->dev.id = id;
dev_set_drvdata(dev, mgr);
mgr->dev.id = id;
dev_set_drvdata(dev, mgr);
- dt_label = of_get_property(mgr->dev.of_node, "label", NULL);
- if (dt_label)
- ret = dev_set_name(&mgr->dev, "%s", dt_label);
- else
- ret = dev_set_name(&mgr->dev, "fpga%d", id);
+ ret = dev_set_name(&mgr->dev, "fpga%d", id);
+ if (ret)
+ goto error_device;
ret = device_add(&mgr->dev);
if (ret)
ret = device_add(&mgr->dev);
if (ret)