adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Staging: b3dfg: remove check for pci bus master

Browse source 
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>
This commit is contained in:
Vasilis Liaskovitis 2009-09-22 01:11:56 -05:00 committed by Greg Kroah-Hartman
parent e20aea64e1
commit 9dbeb89672
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/b3dfg/b3dfg.c
View file

@ -468,7 +468,6 @@ static int get_wand_status(struct b3dfg_dev *fgdev, int __user *arg)
static int enable_transmission(struct b3dfg_dev *fgdev) static int enable_transmission(struct b3dfg_dev *fgdev)
{ {
u16 command;
unsigned long flags; unsigned long flags;
struct device *dev = &fgdev->pdev->dev; struct device *dev = &fgdev->pdev->dev;
@ -480,17 +479,6 @@ static int enable_transmission(struct b3dfg_dev *fgdev)
return -EINVAL; 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); spin_lock_irqsave(&fgdev->buffer_lock, flags);
/* Handle racing enable_transmission calls. */ /* Handle racing enable_transmission calls. */