Merge tag 'pci-v5.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / drivers / pci / pci-sysfs.c

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index b70f61f..7fb5cd1 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1367,7 +1367,7 @@ static umode_t pci_dev_reset_attr_is_visible(struct kobject *kobj,
 {
        struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
 
-       if (!pdev->reset_fn)
+       if (!pci_reset_supported(pdev))
                return 0;
 
        return a->mode;
@@ -1491,6 +1491,7 @@ const struct attribute_group *pci_dev_groups[] = {
        &pci_dev_config_attr_group,
        &pci_dev_rom_attr_group,
        &pci_dev_reset_attr_group,
+       &pci_dev_reset_method_attr_group,
        &pci_dev_vpd_attr_group,
 #ifdef CONFIG_DMI
        &pci_dev_smbios_attr_group,