summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/commsup.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-08-10 14:50:30 -0700
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:40:07 -0400
commit87f3bda35e306a449ea75c2bdb79a3c4d84cfa95 (patch)
tree3be91ee823336f9ddcdde817f94daa4cb27da594 /drivers/scsi/aacraid/commsup.c
parenta0a74e45057cc3138c29173e7b0b3db8b30939ae (diff)
downloadlinux-87f3bda35e306a449ea75c2bdb79a3c4d84cfa95.tar.bz2
[SCSI] aacraid: rename check_reset
Too generic, clashes with ISDN. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Mark Salyzyn <aacraid@adaptec.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid/commsup.c')
-rw-r--r--drivers/scsi/aacraid/commsup.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index bb870906b4cf..240a0bb8986f 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1372,8 +1372,9 @@ int aac_check_health(struct aac_dev * aac)
printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);
- if (!check_reset || (aac->supplement_adapter_info.SupportedOptions2 &
- le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
+ if (!aac_check_reset ||
+ (aac->supplement_adapter_info.SupportedOptions2 &
+ le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
goto out;
host = aac->scsi_host_ptr;
if (aac->thread->pid != current->pid)