diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2011-05-23 14:44:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 10:01:17 -0700 |
| commit | bb2b43fefab723f4a0760146e7bed59d41a50e53 (patch) | |
| tree | 6b10e25669c7edc00280b5ace564be29347d767c /drivers/base | |
| parent | 7316a9f2a94c14e66e9421a777dffc509a2fe0e3 (diff) | |
| download | linux-3.10-bb2b43fefab723f4a0760146e7bed59d41a50e53.tar.gz linux-3.10-bb2b43fefab723f4a0760146e7bed59d41a50e53.tar.bz2 linux-3.10-bb2b43fefab723f4a0760146e7bed59d41a50e53.zip | |
drivers/base/platform.c: don't mark platform_device_register_resndata() as __init_or_module
This reverts 737a3bb9416ce2a7c7a4 ("Driver core: move platform device
creation helpers to .init.text (if MODULE=n)"). That patch assumed that
platform_device_register_resndata() is only ever called from __init code
but that isn't true in the case ioctl->drm_ioctl->radeon_cp_init().
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=35192
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reported-by: Anthony Basile <blueness@gentoo.org>
Cc: Greg KH <gregkh@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 1c291af637b..6040717b62b 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -367,7 +367,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); * * Returns &struct platform_device pointer on success, or ERR_PTR() on error. */ -struct platform_device *__init_or_module platform_device_register_resndata( +struct platform_device *platform_device_register_resndata( struct device *parent, const char *name, int id, const struct resource *res, unsigned int num, |