Merge remote-tracking branch 'origin/master' into version/4.2

2024-03-21 14:47:01 +01:00
parent 4de0001167 53503cb843
commit d3039c2bf3
1 changed files with 2 additions and 1 deletions
--- a/src/chipset/ali6117.c
+++ b/src/chipset/ali6117.c
@@ -471,7 +471,8 @@ ali6117_init(const device_t *info)

    dev->local = info->local;

-    device_add(&ide_isa_device);
+    if (!(dev->local & 0x08))
+        device_add(&ide_isa_device);

    ali6117_setup(dev);