diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-27 17:30:49 +0200 |
| commit | af9cc93c0dee5fc1f9fa32cd9d79a456738a21be (patch) | |
| tree | 91aed45708ad9782de42560ecd25ea5f740dae9b /drivers/extcon/extcon-palmas.c | |
| parent | bb03ed216370cb021f377f923471e56d1de3ff5d (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
Merge tag 'asoc-fix-v4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'drivers/extcon/extcon-palmas.c')
| -rw-r--r-- | drivers/extcon/extcon-palmas.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 841a4b586395..8b3226dca1d9 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -348,8 +348,7 @@ static int palmas_usb_probe(struct platform_device *pdev) palmas_vbus_irq_handler, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | - IRQF_ONESHOT | - IRQF_EARLY_RESUME, + IRQF_ONESHOT, "palmas_usb_vbus", palmas_usb); if (status < 0) { |