|
@@ -298,18 +298,19 @@ static int of_fpga_region_notify_pre_apply(struct fpga_region *region,
|
|
struct fpga_image_info *info;
|
|
struct fpga_image_info *info;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- if (region->info) {
|
|
|
|
- dev_err(dev, "Region already has overlay applied.\n");
|
|
|
|
- return -EINVAL;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
info = of_fpga_region_parse_ov(region, nd->overlay);
|
|
info = of_fpga_region_parse_ov(region, nd->overlay);
|
|
if (IS_ERR(info))
|
|
if (IS_ERR(info))
|
|
return PTR_ERR(info);
|
|
return PTR_ERR(info);
|
|
|
|
|
|
|
|
+ /* If overlay doesn't program the FPGA, accept it anyway. */
|
|
if (!info)
|
|
if (!info)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
+ if (region->info) {
|
|
|
|
+ dev_err(dev, "Region already has overlay applied.\n");
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
+
|
|
region->info = info;
|
|
region->info = info;
|
|
ret = fpga_region_program_fpga(region);
|
|
ret = fpga_region_program_fpga(region);
|
|
if (ret) {
|
|
if (ret) {
|