projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mcb
/
mcb-pci.c
diff --git
a/drivers/mcb/mcb-pci.c
b/drivers/mcb/mcb-pci.c
index 0af7361e377f61565258346f3f84a3933b9f15ba..de36237d7c6b45de10fca57cc1870fde5a0620e5 100644
(file)
--- a/
drivers/mcb/mcb-pci.c
+++ b/
drivers/mcb/mcb-pci.c
@@
-56,9
+56,9
@@
static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
res = request_mem_region(priv->mapbase, CHAM_HEADER_SIZE,
KBUILD_MODNAME);
- if (
IS_ERR(res)
) {
+ if (
!res
) {
dev_err(&pdev->dev, "Failed to request PCI memory\n");
- ret =
PTR_ERR(res)
;
+ ret =
-EBUSY
;
goto out_disable;
}