aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-05-25 14:58:04 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-05-25 14:58:04 -0700
commit4b463f785837f73bdd88ae3821bb7b69599010c9 (patch)
tree80dc0a7e3e33596ff3ece410d9ff9e6b63e45b87 /drivers/scsi
parent6df16d0c35b9c0d3627f30c106e6142d3d12662b (diff)
parent384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 (diff)
downloadkernel_samsung_smdk4412-4b463f785837f73bdd88ae3821bb7b69599010c9.zip
kernel_samsung_smdk4412-4b463f785837f73bdd88ae3821bb7b69599010c9.tar.gz
kernel_samsung_smdk4412-4b463f785837f73bdd88ae3821bb7b69599010c9.tar.bz2
Merge of /home/davem/src/GIT/linux-2.6/.git/
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index f90efa2..c13e563 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -659,8 +659,11 @@ ahc_linux_slave_alloc(struct scsi_device *device)
ahc_lock(ahc, &flags);
targ = ahc->platform_data->targets[target_offset];
if (targ == NULL) {
- targ = ahc_linux_alloc_target(ahc, starget->channel, starget->id);
- struct seeprom_config *sc = ahc->seep_config;
+ struct seeprom_config *sc;
+
+ targ = ahc_linux_alloc_target(ahc, starget->channel,
+ starget->id);
+ sc = ahc->seep_config;
if (targ == NULL)
goto out;