diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
| commit | 9430148d800dd929ad73da4c6afb67f793f8af43 (patch) | |
| tree | 437d0aec41428cbb310a202100ba581c63fbe89e /sound/soc/sh | |
| parent | d22665702226e9c40bc331098559e3d55e7cd43d (diff) | |
| parent | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (diff) | |
Merge branch 'topic/remove-irqf_disable' into for-linus
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/fsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 8e112ccffb13..1493ebf4d943 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
| @@ -1285,7 +1285,7 @@ static int fsi_probe(struct platform_device *pdev) | |||
| 1285 | pm_runtime_enable(&pdev->dev); | 1285 | pm_runtime_enable(&pdev->dev); |
| 1286 | dev_set_drvdata(&pdev->dev, master); | 1286 | dev_set_drvdata(&pdev->dev, master); |
| 1287 | 1287 | ||
| 1288 | ret = request_irq(irq, &fsi_interrupt, IRQF_DISABLED, | 1288 | ret = request_irq(irq, &fsi_interrupt, 0, |
| 1289 | id_entry->name, master); | 1289 | id_entry->name, master); |
| 1290 | if (ret) { | 1290 | if (ret) { |
| 1291 | dev_err(&pdev->dev, "irq request err\n"); | 1291 | dev_err(&pdev->dev, "irq request err\n"); |