diff options
| author | Wu Liang feng <wulf@rock-chips.com> | 2016-07-06 10:08:56 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2016-07-06 13:59:23 +0800 |
| commit | e8f0a9830b0b5432b7cfdafdce9eb933807dce14 (patch) | |
| tree | 7f55f0dda9808c2a431871e7ea1e16b62ed82dd6 /drivers/extcon | |
| parent | 62b5ed622d843f8870c6a0779a9088e9b905cdfd (diff) | |
extcon: fix duplicate create switch class
If "CONFIG_ANDROID" and "CONFIG_SWITCH" are enabled,
/sys/class/switch/* are created in switch classe driver,
so we can't create switch class again in extcon.
Change-Id: Ida627cfdbb3ecb6f0aa40af146a66897edafd2fe
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 21a123cadf78..a101db469857 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -635,7 +635,7 @@ static int create_extcon_class(void) return PTR_ERR(extcon_class); extcon_class->dev_groups = extcon_groups; -#if defined(CONFIG_ANDROID) +#if defined(CONFIG_ANDROID) && !defined(CONFIG_SWITCH) switch_class = class_compat_register("switch"); if (WARN(!switch_class, "cannot allocate")) return -ENOMEM; |