Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218477
b: refs/heads/master
c: 0b2d8d9
h: refs/heads/master
i:
  218475: f11c27a
v: v3
  • Loading branch information
Linus Torvalds committed Oct 28, 2010
1 parent 51ff280 commit 3fe0e57
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22cdbd1d5789cc16c37102eb6f62c3ae377b849e
refs/heads/master: 0b2d8d9e562de3ee2476f549549e4fefbb7a4213
3 changes: 0 additions & 3 deletions trunk/drivers/pci/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
#endif /* HAVE_PCI_MMAP */
int ret = 0;

lock_kernel();

switch (cmd) {
case PCIIOC_CONTROLLER:
ret = pci_domain_nr(dev->bus);
Expand Down Expand Up @@ -242,7 +240,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
break;
};

unlock_kernel();
return ret;
}

Expand Down

0 comments on commit 3fe0e57

Please sign in to comment.