author: Geert Uytterhoeven <geert@linux-m68k.org> 2020-07-13 09:24:29 +0200
committer: Geert Uytterhoeven <geert@linux-m68k.org> 2020-08-26 13:26:52 +0200
commit: ea2abe2fd59a73b26c01e9a3bb83efc46e44face
parent: 3b0950af21e02a8c902ce1143ac5563fadcdfb3e
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 47c733817903..1b9928648583 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -181,7 +181,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
z->resource.name = z->name;
r = zorro_find_parent_resource(pdev, z);
error = request_resource(r, &z->resource);
- if (error)
+ if (error && !(z->rom.er_Type & ERTF_MEMLIST))
dev_err(&bus->dev,
"Address space collision on device %s %pR\n",
z->name, &z->resource);