diff options
author | Dave Jones <davej@redhat.com> | 2009-03-16 05:06:05 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-03-24 07:35:17 -0400 |
commit | 0061d38642244892e17156f005bd7055fe744644 (patch) | |
tree | 73630b32367bde8f13cf6570e42cd6721c28afc6 /drivers/block | |
parent | d399228646e26db315d6233bed65ec9d08c57f57 (diff) |
cpqarray: enable bus mastering
We've been carrying this patch for the last 3 years in Fedora,
long past time we got it upstream...
Call pci_set_master to enable bus-mastering if the BIOS hasn't
done it already.
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/cpqarray.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 5d39df14ed90..ca268ca11159 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
@@ -617,6 +617,7 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
617 | int i; | 617 | int i; |
618 | 618 | ||
619 | c->pci_dev = pdev; | 619 | c->pci_dev = pdev; |
620 | pci_set_master(pdev); | ||
620 | if (pci_enable_device(pdev)) { | 621 | if (pci_enable_device(pdev)) { |
621 | printk(KERN_ERR "cpqarray: Unable to Enable PCI device\n"); | 622 | printk(KERN_ERR "cpqarray: Unable to Enable PCI device\n"); |
622 | return -1; | 623 | return -1; |