Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217524
b: refs/heads/master
c: 10ad527
h: refs/heads/master
v: v3
  • Loading branch information
Rahul Ruikar authored and Linus Torvalds committed Oct 26, 2010
1 parent cdefcb4 commit c9417a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 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: ca1cab37d91cbe8a8333732540d43cabb54cfa85
refs/heads/master: 10ad5278bbc961c9df8260f3e116d60eaaa3fb18
8 changes: 6 additions & 2 deletions trunk/drivers/misc/phantom.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,10 @@ static int __devinit phantom_probe(struct pci_dev *pdev,
int retval;

retval = pci_enable_device(pdev);
if (retval)
if (retval) {
dev_err(&pdev->dev, "pci_enable_device failed!\n");
goto err;
}

minor = phantom_get_free();
if (minor == PHANTOM_MAX_MINORS) {
Expand All @@ -356,8 +358,10 @@ static int __devinit phantom_probe(struct pci_dev *pdev,
phantom_devices[minor] = 1;

retval = pci_request_regions(pdev, "phantom");
if (retval)
if (retval) {
dev_err(&pdev->dev, "pci_request_regions failed!\n");
goto err_null;
}

retval = -ENOMEM;
pht = kzalloc(sizeof(*pht), GFP_KERNEL);
Expand Down

0 comments on commit c9417a3

Please sign in to comment.