diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/message/fusion/mptctl.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
| -rw-r--r-- | drivers/message/fusion/mptctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 7577c2417e2e..cb2d59d5f5af 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
| @@ -1326,7 +1326,7 @@ mptctl_gettargetinfo (unsigned long arg) | |||
| 1326 | */ | 1326 | */ |
| 1327 | if (hd && hd->Targets) { | 1327 | if (hd && hd->Targets) { |
| 1328 | mpt_findImVolumes(ioc); | 1328 | mpt_findImVolumes(ioc); |
| 1329 | pIoc2 = ioc->spi_data.pIocPg2; | 1329 | pIoc2 = ioc->raid_data.pIocPg2; |
| 1330 | for ( id = 0; id <= max_id; ) { | 1330 | for ( id = 0; id <= max_id; ) { |
| 1331 | if ( pIoc2 && pIoc2->NumActiveVolumes ) { | 1331 | if ( pIoc2 && pIoc2->NumActiveVolumes ) { |
| 1332 | if ( id == pIoc2->RaidVolume[0].VolumeID ) { | 1332 | if ( id == pIoc2->RaidVolume[0].VolumeID ) { |
| @@ -1348,7 +1348,7 @@ mptctl_gettargetinfo (unsigned long arg) | |||
| 1348 | --maxWordsLeft; | 1348 | --maxWordsLeft; |
| 1349 | goto next_id; | 1349 | goto next_id; |
| 1350 | } else { | 1350 | } else { |
| 1351 | pIoc3 = ioc->spi_data.pIocPg3; | 1351 | pIoc3 = ioc->raid_data.pIocPg3; |
| 1352 | for ( jj = 0; jj < pIoc3->NumPhysDisks; jj++ ) { | 1352 | for ( jj = 0; jj < pIoc3->NumPhysDisks; jj++ ) { |
| 1353 | if ( pIoc3->PhysDisk[jj].PhysDiskID == id ) | 1353 | if ( pIoc3->PhysDisk[jj].PhysDiskID == id ) |
| 1354 | goto next_id; | 1354 | goto next_id; |
