diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /drivers/scsi/aic7xxx/aic7xxx_proc.c | |
parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_proc.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c index ab4469d83fb1..3802c91f0b07 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_proc.c +++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c | |||
@@ -155,9 +155,9 @@ ahc_dump_target_state(struct ahc_softc *ahc, struct info_str *info, | |||
155 | copy_info(info, "\tUser: "); | 155 | copy_info(info, "\tUser: "); |
156 | ahc_format_transinfo(info, &tinfo->user); | 156 | ahc_format_transinfo(info, &tinfo->user); |
157 | starget = ahc->platform_data->starget[target_offset]; | 157 | starget = ahc->platform_data->starget[target_offset]; |
158 | targ = scsi_transport_target_data(starget); | 158 | if (!starget) |
159 | if (targ == NULL) | ||
160 | return; | 159 | return; |
160 | targ = scsi_transport_target_data(starget); | ||
161 | 161 | ||
162 | copy_info(info, "\tGoal: "); | 162 | copy_info(info, "\tGoal: "); |
163 | ahc_format_transinfo(info, &tinfo->goal); | 163 | ahc_format_transinfo(info, &tinfo->goal); |