Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a89811 authored by Roger Quadros's avatar Roger Quadros Committed by Chanwoo Choi
Browse files

extcon: Fix extcon_cable_get_state() from getting old state after notification 



Currently the extcon code notifiers the interested listeners
before it updates the extcon state with the new state.
This will cause the listeners that use extcon_cable_get_state()
to get the stale state and loose the new state.

Fix this by first changing the extcon state variable and then
notifying listeners.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Tested-by: default avatarIvan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent be052cc8

drivers/extcon/extcon.c

+10 −5
Original line number Diff line number Diff line
@@ -275,20 +275,25 @@ int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state) 
	spin_lock_irqsave(&edev->lock, flags);



	if (edev->state != ((edev->state & ~mask) | (state & mask))) {

		u32 old_state;



		if (check_mutually_exclusive(edev, (edev->state & ~mask) |

						   (state & mask))) {

			spin_unlock_irqrestore(&edev->lock, flags);

			return -EPERM;

		}



		for (index = 0; index < edev->max_supported; index++) {

			if (is_extcon_changed(edev->state, state, index, &attached))

				raw_notifier_call_chain(&edev->nh[index], attached, edev);

		}



		old_state = edev->state;

		edev->state &= ~mask;

		edev->state |= state & mask;



		for (index = 0; index < edev->max_supported; index++) {

			if (is_extcon_changed(old_state, edev->state, index,

					      &attached))

				raw_notifier_call_chain(&edev->nh[index],

							attached, edev);

		}



		/* This could be in interrupt handler */

		prop_buf = (char *)get_zeroed_page(GFP_ATOMIC);

		if (prop_buf) {