diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2014-10-28 17:40:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 15:16:02 -0800 |
| commit | 291f653a140ad880426125e5e9dbb70f4c184683 (patch) | |
| tree | 5f80732c03b2ba2c9b2ef339036b8871e6148d6b /include/linux/platform_device.h | |
| parent | c3b50dc219e1437e4dcb6a1639b004648dc29faa (diff) | |
| download | op-kernel-dev-291f653a140ad880426125e5e9dbb70f4c184683.zip op-kernel-dev-291f653a140ad880426125e5e9dbb70f4c184683.tar.gz | |
core: platform: let platform_create_bundle initialize module owner
Since commit 9447057eaff8 ("platform_device: use a macro instead of
platform_driver_register"), platform_driver_register() always overwrites
the .owner field of a platform_driver with THIS_MODULE. This breaks
platform_create_bundle() which uses it via platform_driver_probe() from
within the platform core instead of the module init. Fix it by using a
similar #define construct to obtain THIS_MODULE and pass it on later.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index c8d95c6..ae4882c 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -240,10 +240,12 @@ static void __exit __platform_driver##_exit(void) \ } \ module_exit(__platform_driver##_exit); -extern struct platform_device *platform_create_bundle( +#define platform_create_bundle(driver, probe, res, n_res, data, size) \ + __platform_create_bundle(driver, probe, res, n_res, data, size, THIS_MODULE) +extern struct platform_device *__platform_create_bundle( struct platform_driver *driver, int (*probe)(struct platform_device *), struct resource *res, unsigned int n_res, - const void *data, size_t size); + const void *data, size_t size, struct module *module); /* early platform driver interface */ struct early_platform_driver { |
