diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /drivers/message/fusion/mptsas.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/message/fusion/mptsas.c')
| -rw-r--r-- | drivers/message/fusion/mptsas.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index f77b329f6923..78734e25edd5 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
| @@ -1701,6 +1701,11 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info, | |||
| 1701 | if (error) | 1701 | if (error) |
| 1702 | goto out_free_consistent; | 1702 | goto out_free_consistent; |
| 1703 | 1703 | ||
| 1704 | if (!buffer->NumPhys) { | ||
| 1705 | error = -ENODEV; | ||
| 1706 | goto out_free_consistent; | ||
| 1707 | } | ||
| 1708 | |||
| 1704 | /* save config data */ | 1709 | /* save config data */ |
| 1705 | port_info->num_phys = buffer->NumPhys; | 1710 | port_info->num_phys = buffer->NumPhys; |
| 1706 | port_info->phy_info = kcalloc(port_info->num_phys, | 1711 | port_info->phy_info = kcalloc(port_info->num_phys, |