Merge tag 'v4.0-rc1' into perf/core, to refresh the tree

[cascardo/linux.git] / arch / x86 / kernel / cpu / perf_event_intel_uncore_snbep.c

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 21af614..12d9548 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -1132,8 +1132,7 @@ static int snbep_pci2phy_map_init(int devid)
                }
        }
 
-       if (ubox_dev)
-               pci_dev_put(ubox_dev);
+       pci_dev_put(ubox_dev);
 
        return err ? pcibios_err_to_errno(err) : 0;
 }