Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf0f23c authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mptfusion: Proper error handling is added after mpt_config timeout 



Added proper error handling after mpt_config.
Now check of MPI_IOCSTATUS_CONFIG_INVALID_PAGE is added.
If error is MPI_IOCSTATUS_CONFIG_INVALID_PAGE, driver will return -ENODEV.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f18a8927

drivers/message/fusion/mptsas.c

+11 −5
Original line number Diff line number Diff line
@@ -2523,6 +2523,12 @@ mptsas_sas_device_pg0(MPT_ADAPTER *ioc, struct mptsas_devinfo *device_info, 
	cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;



	error = mpt_config(ioc, &cfg);



	if (error == MPI_IOCSTATUS_CONFIG_INVALID_PAGE) {

		error = -ENODEV;

		goto out_free_consistent;

	}



	if (error)

		goto out_free_consistent;
@@ -2599,14 +2605,14 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info, 
	cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;



	error = mpt_config(ioc, &cfg);

	if (error)

		goto out_free_consistent;



	if (!buffer->NumPhys) {

	if (error == MPI_IOCSTATUS_CONFIG_INVALID_PAGE) {

		error = -ENODEV;

		goto out_free_consistent;

	}



	if (error)

		goto out_free_consistent;



	/* save config data */

	port_info->num_phys = (buffer->NumPhys) ? buffer->NumPhys : 1;

	port_info->phy_info = kcalloc(port_info->num_phys,
@@ -2682,7 +2688,7 @@ mptsas_sas_expander_pg1(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, 


	if (error == MPI_IOCSTATUS_CONFIG_INVALID_PAGE) {

		error = -ENODEV;

		goto out;

		goto out_free_consistent;

	}



	if (error)