summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-09 15:27:59 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-09 15:27:59 -0500
commitda095587e6be858efd41490762cb952dffd6107a (patch)
treea7650ab5c0fa3a6a3841de8e8693041b3e009054 /drivers/ide
parentb2ae75052a8c1611b2030fa49ba1c6b6439fa04f (diff)
downloadlinux-da095587e6be858efd41490762cb952dffd6107a.tar.gz
linux-da095587e6be858efd41490762cb952dffd6107a.tar.bz2
linux-da095587e6be858efd41490762cb952dffd6107a.zip
Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
This reverts commit b2ae75052a8c1611b2030fa49ba1c6b6439fa04f. The inverse logic is intentional, and this change even breaks booting on some systems. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 419818a39c27..54d7c4685d23 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -96,10 +96,10 @@ static int __init ide_generic_init(void)
printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" "
"module parameter for probing all legacy ISA IDE ports\n");
- if (primary)
+ if (primary == 0)
probe_mask |= 0x1;
- if (secondary)
+ if (secondary == 0)
probe_mask |= 0x2;
} else
printk(KERN_INFO DRV_NAME ": enforcing probing of I/O ports "