Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull fpga driver fixes from Greg KH:
"Only two small fpga driver fixes here, both have been in linux-next
for a while, and resolve some reported issues"
* tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
fpga manager: Fix firmware resource leak on error
fpga manager: remove label
+4
-9
+4
-9
drivers/fpga/fpga-mgr.c
+4
-9
drivers/fpga/fpga-mgr.c
···
122
122
}
123
123
124
124
ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
125
-
if (ret)
126
-
return ret;
127
125
128
126
release_firmware(fw);
129
127
130
-
return 0;
128
+
return ret;
131
129
}
132
130
EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);
133
131
···
254
256
void *priv)
255
257
{
256
258
struct fpga_manager *mgr;
257
-
const char *dt_label;
258
259
int id, ret;
259
260
260
261
if (!mops || !mops->write_init || !mops->write ||
···
297
300
mgr->dev.id = id;
298
301
dev_set_drvdata(dev, mgr);
299
302
300
-
dt_label = of_get_property(mgr->dev.of_node, "label", NULL);
301
-
if (dt_label)
302
-
ret = dev_set_name(&mgr->dev, "%s", dt_label);
303
-
else
304
-
ret = dev_set_name(&mgr->dev, "fpga%d", id);
303
+
ret = dev_set_name(&mgr->dev, "fpga%d", id);
304
+
if (ret)
305
+
goto error_device;
305
306
306
307
ret = device_add(&mgr->dev);
307
308
if (ret)