From: Dmitriy Monakhov <dmonakhov@xxxxxxxxxx> Since mpt-fusion-handle-pci-layer-error-on-resume.patch function mpt_resume() can return error code. Signed-off-by: Monakhov Dmitriy <dmonakhov@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Cc: "Moore, Eric Dean" <Eric.Moore@xxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/message/fusion/mptscsih.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN drivers/message/fusion/mptscsih.c~mpt-fusion-handle-mpt_resume-failure-while-resuming drivers/message/fusion/mptscsih.c --- a/drivers/message/fusion/mptscsih.c~mpt-fusion-handle-mpt_resume-failure-while-resuming +++ a/drivers/message/fusion/mptscsih.c @@ -1191,8 +1191,11 @@ mptscsih_resume(struct pci_dev *pdev) MPT_ADAPTER *ioc = pci_get_drvdata(pdev); struct Scsi_Host *host = ioc->sh; MPT_SCSI_HOST *hd; + int ret; - mpt_resume(pdev); + ret = mpt_resume(pdev); + if (ret) + return ret; if(!host) return 0; _ - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
