aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasilis Liaskovitis <vliaskov@gmail.com>2009-09-22 01:11:56 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:21:46 -0800
commit9dbeb8967262f2e6777441318780f224261ec410 (patch)
treefde93d49b40eaacd37da223b601caca45d4c10d3
parente20aea64e160d5873c2aaf62cc255ea81ce000eb (diff)
Staging: b3dfg: remove check for pci bus master
Remove unneccesary check for pci master in enable_transmission() Signed-off-by: Vasilis Liaskovitis <vliaskov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/b3dfg/b3dfg.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/b3dfg/b3dfg.c b/drivers/staging/b3dfg/b3dfg.c
index cda26bb493b..4a43c51c172 100644
--- a/drivers/staging/b3dfg/b3dfg.c
+++ b/drivers/staging/b3dfg/b3dfg.c
@@ -468,7 +468,6 @@ static int get_wand_status(struct b3dfg_dev *fgdev, int __user *arg)
static int enable_transmission(struct b3dfg_dev *fgdev)
{
- u16 command;
unsigned long flags;
struct device *dev = &fgdev->pdev->dev;
@@ -480,17 +479,6 @@ static int enable_transmission(struct b3dfg_dev *fgdev)
return -EINVAL;
}
- /*
- * Check we're a bus master.
- * TODO: I think we can remove this having added the pci_set_master call
- */
- pci_read_config_word(fgdev->pdev, PCI_COMMAND, &command);
- if (!(command & PCI_COMMAND_MASTER)) {
- dev_err(dev, "not a bus master, force-enabling\n");
- pci_write_config_word(fgdev->pdev, PCI_COMMAND,
- command | PCI_COMMAND_MASTER);
- }
-
spin_lock_irqsave(&fgdev->buffer_lock, flags);
/* Handle racing enable_transmission calls. */