From 393e2739b4a6eac5f3463adc5a2fa515cf3e6993 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 30 Nov 2011 16:30:33 -0800 Subject: [PATCH] --- yaml --- r: 282266 b: refs/heads/master c: 2f73b9a896634dd0ce68b5af9ae5f475e24ce51e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05230ea2abc4..eb8743cadb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c24a1710d18d706ee2bbd87390868242f1a6d8d5 +refs/heads/master: 2f73b9a896634dd0ce68b5af9ae5f475e24ce51e diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c index 65c377dc0279..2da49cdf0208 100644 --- a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -1407,7 +1407,7 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc) if (_base_check_enable_msix(ioc) != 0) goto try_ioapic; - ioc->reply_queue_count = min_t(u8, ioc->cpu_count, + ioc->reply_queue_count = min_t(int, ioc->cpu_count, ioc->msix_vector_count); entries = kcalloc(ioc->reply_queue_count, sizeof(struct msix_entry),