projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-microblaze.git]
/
drivers
/
gpio
/
gpio-pxa.c
diff --git
a/drivers/gpio/gpio-pxa.c
b/drivers/gpio/gpio-pxa.c
index
1361270
..
0cb6600
100644
(file)
--- a/
drivers/gpio/gpio-pxa.c
+++ b/
drivers/gpio/gpio-pxa.c
@@
-660,8
+660,8
@@
static int pxa_gpio_probe(struct platform_device *pdev)
pchip->irq1 = irq1;
gpio_reg_base = devm_platform_ioremap_resource(pdev, 0);
- if (
!gpio_reg_base
)
- return
-EINVAL
;
+ if (
IS_ERR(gpio_reg_base)
)
+ return
PTR_ERR(gpio_reg_base)
;
clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {