Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two small fixes, all in drivers (the more obsolete mpt3sas and the
newer mpi3mr)"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: mpt3sas: Prevent sending diag_reset when the controller is ready
scsi: mpi3mr: Reduce stack usage in mpi3mr_refresh_sas_ports()
+9
-2
+6
-1
drivers/scsi/mpi3mr/mpi3mr_transport.c
+6
-1
drivers/scsi/mpi3mr/mpi3mr_transport.c
···
1671
1671
void
1672
1672
mpi3mr_refresh_sas_ports(struct mpi3mr_ioc *mrioc)
1673
1673
{
1674
-
struct host_port h_port[64];
1674
+
struct host_port *h_port = NULL;
1675
1675
int i, j, found, host_port_count = 0, port_idx;
1676
1676
u16 sz, attached_handle, ioc_status;
1677
1677
struct mpi3_sas_io_unit_page0 *sas_io_unit_pg0 = NULL;
···
1685
1685
sas_io_unit_pg0 = kzalloc(sz, GFP_KERNEL);
1686
1686
if (!sas_io_unit_pg0)
1687
1687
return;
1688
+
h_port = kcalloc(64, sizeof(struct host_port), GFP_KERNEL);
1689
+
if (!h_port)
1690
+
goto out;
1691
+
1688
1692
if (mpi3mr_cfg_get_sas_io_unit_pg0(mrioc, sas_io_unit_pg0, sz)) {
1689
1693
ioc_err(mrioc, "failure at %s:%d/%s()!\n",
1690
1694
__FILE__, __LINE__, __func__);
···
1818
1814
}
1819
1815
}
1820
1816
out:
1817
+
kfree(h_port);
1821
1818
kfree(sas_io_unit_pg0);
1822
1819
}
1823
1820