diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-10-17 14:14:06 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-10-17 14:14:06 +0800 |
| commit | 58c8a863550b19ab3559dd5f5e27cc698c03e53b (patch) | |
| tree | a9df76b4b06e65edc07bd2f7add99451bf929d69 /drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | |
| parent | ce4e45842de3eb54b8dd6e081765d741f5b92b56 (diff) | |
| parent | ba439a6cbfa2936a6713f64cb499de7943673fe3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up chelsio bug fix.
Diffstat (limited to 'drivers/crypto/qat/qat_dh895xccvf/adf_drv.c')
| -rw-r--r-- | drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c index 26ab17bfc6da..3da0f951cb59 100644 --- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c +++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c @@ -125,7 +125,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) struct adf_hw_device_data *hw_data; char name[ADF_DEVICE_NAME_LENGTH]; unsigned int i, bar_nr; - int ret, bar_mask; + unsigned long bar_mask; + int ret; switch (ent->device) { case ADF_DH895XCCIOV_PCI_DEVICE_ID: @@ -215,8 +216,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* Find and map all the device's BARS */ i = 0; bar_mask = pci_select_bars(pdev, IORESOURCE_MEM); - for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask, - ADF_PCI_MAX_BARS * 2) { + for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) { struct adf_bar *bar = &accel_pci_dev->pci_bars[i++]; bar->base_addr = pci_resource_start(pdev, bar_nr); |