From 9e2ac6336b344f0d9e91b7c684e49fb5383e9a34 Mon Sep 17 00:00:00 2001 From: Todd Poynter Date: Sat, 6 Sep 2014 11:25:10 -0700 Subject: [PATCH] Revert "extcon: palmas: remove mutually exclusive property" This reverts commit a717679c20944e4109d9823c45cd8769c8871447. Bug 200004368 Change-Id: Ib88c7b7ba2edde8d7b11c933d5080823d17a329f Signed-off-by: Todd Poynter Reviewed-on: http://git-master/r/496363 --- drivers/extcon/extcon-palmas.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index c12fd027c7a..ee6f716e3a2 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * * Author: Graeme Gregory * Author: Kishon Vijay Abraham I @@ -53,6 +53,8 @@ static char const *palmas_extcon_cable[] = { NULL, }; +static const int mutually_exclusive[] = {0x3, 0x0}; + static void palmas_usb_wakeup(struct palmas *palmas, int enable) { if (enable) @@ -338,6 +340,7 @@ static int palmas_usb_probe(struct platform_device *pdev) platform_set_drvdata(pdev, palmas_usb); palmas_usb->edev.supported_cable = palmas_extcon_cable; + palmas_usb->edev.mutually_exclusive = mutually_exclusive; palmas_usb->edev.name = (ext_name) ? ext_name : dev_name(&pdev->dev); status = extcon_dev_register(&palmas_usb->edev, palmas_usb->dev); -- 2.39.2