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

Commit ad5d0166 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "extcon: Add DP lane number notification"

parents 7daff615 86825eb8

drivers/extcon/extcon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -487,7 +487,7 @@ int extcon_sync(struct extcon_dev *edev, unsigned int id) 
}

}

EXPORT_SYMBOL_GPL(extcon_sync);

EXPORT_SYMBOL_GPL(extcon_sync);





int extcon_blocking_sync(struct extcon_dev *edev, unsigned int id, bool val)

int extcon_blocking_sync(struct extcon_dev *edev, unsigned int id, u8 val)

{

{

	int index;

	int index;

include/linux/extcon.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, 
extern const char *extcon_get_edev_name(struct extcon_dev *edev);

extern const char *extcon_get_edev_name(struct extcon_dev *edev);





extern int extcon_blocking_sync(struct extcon_dev *edev, unsigned int id,

extern int extcon_blocking_sync(struct extcon_dev *edev, unsigned int id,

							bool val);

							u8 val);

#else /* CONFIG_EXTCON */

#else /* CONFIG_EXTCON */

static inline int extcon_get_state(struct extcon_dev *edev, unsigned int id)

static inline int extcon_get_state(struct extcon_dev *edev, unsigned int id)

{

{