Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199408
b: refs/heads/master
c: 0aeee5d
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Samuel Ortiz committed May 27, 2010
1 parent 35e924a commit 27de8dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e4be3cb72ce40482a9fe19210ad5de8bfc061bb5
refs/heads/master: 0aeee5d4f6aa9bd28373907727937b7935d0434c
8 changes: 4 additions & 4 deletions trunk/drivers/mfd/pcf50633-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,18 +354,18 @@ static void pcf50633_irq_worker(struct work_struct *work)
if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
if (chgstat & (0x3 << 4))
pcf_int[0] &= ~(1 << PCF50633_INT1_USBREM);
pcf_int[0] &= ~PCF50633_INT1_USBREM;
else
pcf_int[0] &= ~(1 << PCF50633_INT1_USBINS);
pcf_int[0] &= ~PCF50633_INT1_USBINS;
}

/* Make sure only one of ADPINS or ADPREM is set */
if (pcf_int[0] & (PCF50633_INT1_ADPINS | PCF50633_INT1_ADPREM)) {
chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
if (chgstat & (0x3 << 4))
pcf_int[0] &= ~(1 << PCF50633_INT1_ADPREM);
pcf_int[0] &= ~PCF50633_INT1_ADPREM;
else
pcf_int[0] &= ~(1 << PCF50633_INT1_ADPINS);
pcf_int[0] &= ~PCF50633_INT1_ADPINS;
}

dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x "
Expand Down

0 comments on commit 27de8dc

Please sign in to comment.