aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/aacraid/commsup.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index a2ea70d8a13a..1994c7445b54 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1908,9 +1908,6 @@ static void aac_resolve_luns(struct aac_dev *dev)
1908 for (bus = 0; bus < AAC_MAX_BUSES; bus++) { 1908 for (bus = 0; bus < AAC_MAX_BUSES; bus++) {
1909 for (target = 0; target < AAC_MAX_TARGETS; target++) { 1909 for (target = 0; target < AAC_MAX_TARGETS; target++) {
1910 1910
1911 if (aac_phys_to_logical(bus) == ENCLOSURE_CHANNEL)
1912 continue;
1913
1914 if (bus == CONTAINER_CHANNEL) 1911 if (bus == CONTAINER_CHANNEL)
1915 channel = CONTAINER_CHANNEL; 1912 channel = CONTAINER_CHANNEL;
1916 else 1913 else
@@ -1922,7 +1919,7 @@ static void aac_resolve_luns(struct aac_dev *dev)
1922 sdev = scsi_device_lookup(dev->scsi_host_ptr, channel, 1919 sdev = scsi_device_lookup(dev->scsi_host_ptr, channel,
1923 target, 0); 1920 target, 0);
1924 1921
1925 if (!sdev && devtype) 1922 if (!sdev && new_devtype)
1926 scsi_add_device(dev->scsi_host_ptr, channel, 1923 scsi_add_device(dev->scsi_host_ptr, channel,
1927 target, 0); 1924 target, 0);
1928 else if (sdev && new_devtype != devtype) 1925 else if (sdev && new_devtype != devtype)