Skip to content

Commit

Permalink
Staging: b3dfg: remove check for pci bus master
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasilis Liaskovitis authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent e20aea6 commit 9dbeb89
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/staging/b3dfg/b3dfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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. */
Expand Down

0 comments on commit 9dbeb89

Please sign in to comment.