Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / powerpc / kernel / eeh_sysfs.c

diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c
index 5d753d4f2c75938e5fdd2c75b821ff98877cd2c9..e2595ba4b720123ad89908b26bf9f9eeff35255c 100644 (file)
--- a/arch/powerpc/kernel/eeh_sysfs.c
+++ b/arch/powerpc/kernel/eeh_sysfs.c
@@ -59,6 +59,9 @@ void eeh_sysfs_add_device(struct pci_dev *pdev)
        struct eeh_dev *edev = pci_dev_to_eeh_dev(pdev);
        int rc=0;
 
+       if (!eeh_enabled())
+               return;
+
        if (edev && (edev->mode & EEH_DEV_SYSFS))
                return;