projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[linux-2.6-microblaze.git]
/
drivers
/
scsi
/
mpt3sas
/
mpt3sas_base.c
diff --git
a/drivers/scsi/mpt3sas/mpt3sas_base.c
b/drivers/scsi/mpt3sas/mpt3sas_base.c
index
969baf4
..
6e23dc3
100644
(file)
--- a/
drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/
drivers/scsi/mpt3sas/mpt3sas_base.c
@@
-5034,7
+5034,7
@@
_base_check_for_trigger_pages_support(struct MPT3SAS_ADAPTER *ioc)
static void
_base_get_diag_triggers(struct MPT3SAS_ADAPTER *ioc)
{
-
u16
trigger_flags;
+
int
trigger_flags;
/*
* Default setting of master trigger.