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 'acpi-hotplug'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
uio
/
uio_pruss.c
diff --git
a/drivers/uio/uio_pruss.c
b/drivers/uio/uio_pruss.c
index 21f7a72301e43536867b1353cc79541652e5b05b..f519da9034b7b5540b872fade72fd2391281fb80 100644
(file)
--- a/
drivers/uio/uio_pruss.c
+++ b/
drivers/uio/uio_pruss.c
@@
-121,7
+121,7
@@
static int pruss_probe(struct platform_device *dev)
struct uio_pruss_dev *gdev;
struct resource *regs_prussio;
int ret = -ENODEV, cnt = 0, len;
struct uio_pruss_dev *gdev;
struct resource *regs_prussio;
int ret = -ENODEV, cnt = 0, len;
- struct uio_pruss_pdata *pdata = dev
->dev.platform_data
;
+ struct uio_pruss_pdata *pdata = dev
_get_platdata(&dev->dev)
;
gdev = kzalloc(sizeof(struct uio_pruss_dev), GFP_KERNEL);
if (!gdev)
gdev = kzalloc(sizeof(struct uio_pruss_dev), GFP_KERNEL);
if (!gdev)
@@
-224,7
+224,6
@@
static int pruss_remove(struct platform_device *dev)
struct uio_pruss_dev *gdev = platform_get_drvdata(dev);
pruss_cleanup(dev, gdev);
struct uio_pruss_dev *gdev = platform_get_drvdata(dev);
pruss_cleanup(dev, gdev);
- platform_set_drvdata(dev, NULL);
return 0;
}
return 0;
}