diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c /drivers/extcon/extcon.c | |
| parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (diff) | |
| parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (diff) | |
| download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/extcon/extcon.c')
| -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 a07addde297b..8dd0af1d50bc 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -159,7 +159,7 @@ static int find_cable_index_by_name(struct extcon_dev *edev, const char *name) static bool is_extcon_changed(u32 prev, u32 new, int idx, bool *attached) { if (((prev >> idx) & 0x1) != ((new >> idx) & 0x1)) { - *attached = new ? true : false; + *attached = ((new >> idx) & 0x1) ? true : false; return true; } |