diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 21:47:37 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 21:47:37 (GMT) |
| commit | 1a370f4cd95e056d55ef5bf1a183880e70195e59 (patch) | |
| tree | c672eb30748d56e7d0df41a0dec7d59c8b65e25a /drivers/edac/i82875p_edac.c | |
| parent | 4b5ca74113a1e02f4a7ea80aea9b977705f3d961 (diff) | |
| parent | 1afaa05515212b136d96a48b2ba2251f40437d87 (diff) | |
| download | linux-1a370f4cd95e056d55ef5bf1a183880e70195e59.tar.xz | |
Merge tag 'edac_for_4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
- convert a bunch of drivers to static attribute groups (Takashi Iwai)
- misc cleanups
* tag 'edac_for_4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC: Constify of_device_id array
EDAC, i82443bxgx: Don't export static symbol
EDAC, amd64_edac: Get rid of per-node driver instances
EDAC: Properly unwind on failure path in edac_init()
EDAC: highbank: Use static attribute groups for sysfs entries
EDAC: octeon: Use static attribute groups for sysfs entries
EDAC: mpc85xx: Use static attribute groups for sysfs entries
EDAC: i7core: Use static attribute groups for sysfs entries
EDAC: i7core: Return proper error codes for kzalloc() errors
EDAC: amd64: Use static attribute groups
EDAC: Allow to pass driver-specific attribute groups
EDAC: Use static attribute groups for managing sysfs entries
EDAC: Delete unnecessary checks before pci_dev_put()
Diffstat (limited to 'drivers/edac/i82875p_edac.c')
| -rw-r--r-- | drivers/edac/i82875p_edac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index 64b6832..c26a513 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c @@ -576,9 +576,7 @@ fail1: pci_unregister_driver(&i82875p_driver); fail0: - if (mci_pdev != NULL) - pci_dev_put(mci_pdev); - + pci_dev_put(mci_pdev); return pci_rc; } |