From 246f57e0b06be3f52c12af99892fbb91c4bcb15b Mon Sep 17 00:00:00 2001 From: Adam Madsen Date: Fri, 13 Nov 2020 22:57:16 -0600 Subject: [PATCH] [core] hook: prefer included fixes over pci/quirks.c --- src/hook.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/hook.c b/src/hook.c index 300b158..0d67af8 100644 --- a/src/hook.c +++ b/src/hook.c @@ -34,15 +34,16 @@ static int hooked_pci_dev_specific_reset(struct pci_dev *dev, int probe) int ret; struct vendor_reset_cfg *cfg; - ret = orig_pci_dev_specific_reset(dev, probe); - if (!ret || ret != -ENOTTY) - return ret; - cfg = vendor_reset_cfg_find(dev->vendor, dev->device); if (!cfg) - return -ENOTTY; + goto do_orig; + + ret = vendor_reset_dev_locked(cfg, dev); + if (!ret || ret != -ENOTTY) + return ret; - return vendor_reset_dev_locked(cfg, dev); +do_orig: + return orig_pci_dev_specific_reset(dev, probe); } struct ftrace_hook fh_hooks[] = {