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 'perf/urgent' into perf/core, to pick up fixes before applying new changes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-74xx-mmio.c
diff --git
a/drivers/gpio/gpio-74xx-mmio.c
b/drivers/gpio/gpio-74xx-mmio.c
index 0763655cca6ccc1ffd6b46f6cb0261a6fa31e9fc..6ed7c0fb3378eac88af03b8c125d0a7c9749f3db 100644
(file)
--- a/
drivers/gpio/gpio-74xx-mmio.c
+++ b/
drivers/gpio/gpio-74xx-mmio.c
@@
-129,7
+129,7
@@
static int mmio_74xx_gpio_probe(struct platform_device *pdev)
if (IS_ERR(dat))
return PTR_ERR(dat);
- priv->flags = (u
nsigned)
of_id->data;
+ priv->flags = (u
intptr_t)
of_id->data;
err = bgpio_init(&priv->bgc, &pdev->dev,
DIV_ROUND_UP(MMIO_74XX_BIT_CNT(priv->flags), 8),