diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 19:41:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 19:41:53 -0800 |
| commit | 9aca90a7ca911af4da5d77fad11f54f040dc027d (patch) | |
| tree | 31f8630711cbee35f46ba61eee1d27473576e390 /arch/powerpc/kernel | |
| parent | 70d070f56a24b0d966aee547b6c51d09e9185b63 (diff) | |
| parent | 9ab3ac233a8b4ffcc27c8475b83dee49fc46bc76 (diff) | |
| download | linux-9aca90a7ca911af4da5d77fad11f54f040dc027d.tar.bz2 | |
Merge tag 'powerpc-4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- eeh: Fix partial hotplug criterion from Gavin Shan
- mm: Clear the invalid slot information correctly from Aneesh Kumar K.V
* tag 'powerpc-4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/mm/hash: Clear the invalid slot information correctly
powerpc/eeh: Fix partial hotplug criterion
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/eeh_driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 301be3126ae3..650cfb31ea3d 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -418,8 +418,7 @@ static void *eeh_rmv_device(void *data, void *userdata) eeh_pcid_put(dev); if (driver->err_handler && driver->err_handler->error_detected && - driver->err_handler->slot_reset && - driver->err_handler->resume) + driver->err_handler->slot_reset) return NULL; } |