Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: pcf50633: fix unsafe disable_irq() mfd: Keep a cache of WM8350 volatile values
This commit is contained in:
commit
a71d6e0d6f
2 changed files with 1 additions and 9 deletions
|
@ -443,7 +443,7 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
|
|||
dev_dbg(pcf->dev, "pcf50633_irq\n");
|
||||
|
||||
get_device(pcf->dev);
|
||||
disable_irq(pcf->irq);
|
||||
disable_irq_nosync(pcf->irq);
|
||||
schedule_work(&pcf->irq_work);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
|
|
@ -79,10 +79,6 @@ static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
|
|||
/* Cache is CPU endian */
|
||||
dest[i - reg] = be16_to_cpu(dest[i - reg]);
|
||||
|
||||
/* Satisfy non-volatile bits from cache */
|
||||
dest[i - reg] &= wm8350_reg_io_map[i].vol;
|
||||
dest[i - reg] |= wm8350->reg_cache[i];
|
||||
|
||||
/* Mask out non-readable bits */
|
||||
dest[i - reg] &= wm8350_reg_io_map[i].readable;
|
||||
}
|
||||
|
@ -182,9 +178,6 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
|
|||
(wm8350->reg_cache[i] & ~wm8350_reg_io_map[i].writable)
|
||||
| src[i - reg];
|
||||
|
||||
/* Don't store volatile bits */
|
||||
wm8350->reg_cache[i] &= ~wm8350_reg_io_map[i].vol;
|
||||
|
||||
src[i - reg] = cpu_to_be16(src[i - reg]);
|
||||
}
|
||||
|
||||
|
@ -1261,7 +1254,6 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
|
|||
(i < WM8350_CLOCK_CONTROL_1 || i > WM8350_AIF_TEST)) {
|
||||
value = be16_to_cpu(wm8350->reg_cache[i]);
|
||||
value &= wm8350_reg_io_map[i].readable;
|
||||
value &= ~wm8350_reg_io_map[i].vol;
|
||||
wm8350->reg_cache[i] = value;
|
||||
} else
|
||||
wm8350->reg_cache[i] = reg_map[i];
|
||||
|
|
Reference in a new issue