mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
[SCSI] mptsas: Fix oops for insmod during kexec
This fix's an oops during driver load time. mptsas_probe calls mpt_attach(over in mptbase.c). Inside that call, we read some manufacturing config pages to setup some defaults. While reading the config pages, the firmware doesn't complete the reply in time, and we have a timeout. The timeout results in hardreset handler being called. The hardreset handler calls all the fusion upper layer driver reset callback handlers. The mptsas_ioc_reset function is the callback handler in mptsas.c. So where I'm getting to, is mptsas_ioc_reset is getting called before scsi_host_alloc is called, and the pointer ioc->sh is NULL as well as the hostdata. Signed-off-by: Judith Lebzelter <judith@osdl.org> Acked-by: "Moore, Eric" <Eric.Moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
5daa49ef05
commit
ba76ef2460
1 changed files with 5 additions and 2 deletions
|
@ -815,7 +815,7 @@ mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
|
|||
static int
|
||||
mptsas_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
|
||||
{
|
||||
MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)ioc->sh->hostdata;
|
||||
MPT_SCSI_HOST *hd;
|
||||
struct mptsas_target_reset_event *target_reset_list, *n;
|
||||
int rc;
|
||||
|
||||
|
@ -827,7 +827,10 @@ mptsas_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
|
|||
if (reset_phase != MPT_IOC_POST_RESET)
|
||||
goto out;
|
||||
|
||||
if (!hd || !hd->ioc)
|
||||
if (!ioc->sh || !ioc->sh->hostdata)
|
||||
goto out;
|
||||
hd = (MPT_SCSI_HOST *)ioc->sh->hostdata;
|
||||
if (!hd->ioc)
|
||||
goto out;
|
||||
|
||||
if (list_empty(&hd->target_reset_list))
|
||||
|
|
Loading…
Reference in a new issue