diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
| commit | 4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f (patch) | |
| tree | 200fe335bd4bb4b2f29f3ff7149b4266b342f158 /drivers/base | |
| parent | 67e4e8c056b1df440b44ff2af785f89de36883da (diff) | |
| parent | 377d261708d3057200c7ad9647fddb15169fea78 (diff) | |
| download | barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.gz barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.xz | |
Merge branch 'for-next/of-device-id'
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 6112b4953b..24cb5bc62b 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -454,7 +454,7 @@ void devices_shutdown(void) } } -int dev_get_drvdata(struct device_d *dev, unsigned long *data) +int dev_get_drvdata(struct device_d *dev, const void **data) { if (dev->of_id_entry) { *data = dev->of_id_entry->data; @@ -462,7 +462,7 @@ int dev_get_drvdata(struct device_d *dev, unsigned long *data) } if (dev->id_entry) { - *data = dev->id_entry->driver_data; + *data = (const void **)dev->id_entry->driver_data; return 0; } |