The patch titled
aerdrv: fix sanity check in report_resume
has been removed from the -mm tree. Its filename was
aerdrv-fix-sanity-check-in-report_resume.patch
This patch was dropped because it was withdrawn
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: aerdrv: fix sanity check in report_resume
From: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
What we have to check here before calling that err_handler->resume is
non-NULL. It seems that this block has been copy&pasted from
report_slot_reset.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
Acked-by: "Zhang, Yanmin" <yanmin.zhang@xxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/pcie/aer/aerdrv_core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/pci/pcie/aer/aerdrv_core.c~aerdrv-fix-sanity-check-in-report_resume drivers/pci/pcie/aer/aerdrv_core.c
--- a/drivers/pci/pcie/aer/aerdrv_core.c~aerdrv-fix-sanity-check-in-report_resume
+++ a/drivers/pci/pcie/aer/aerdrv_core.c
@@ -250,14 +250,14 @@ static void report_resume(struct pci_dev
dev->error_state = pci_channel_io_normal;
- if (!dev->driver ||
- !dev->driver->err_handler ||
- !dev->driver->err_handler->slot_reset)
+ if (!dev->driver)
return;
-
err_handler = dev->driver->err_handler;
+ if (!err_handler)
+ return;
+ if (!err_handler->resume)
+ return;
err_handler->resume(dev);
- return;
}
/**
_
Patches currently in -mm which might be from seto.hidetoshi@xxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
