diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-30 12:40:40 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-30 12:40:40 -0400 |
| commit | eeea8b40cd2866ca24f25e5ef09225edb076ae45 (patch) | |
| tree | ece5b5287ee2ce53a841b66d0f526947f74d036f /drivers/dma/fsl_raid.c | |
| parent | 3383c5c395386ac8e258b1a324c72ce850b84a9e (diff) | |
| parent | 513e43efafe329dad7b5794583b67ac898dcbdca (diff) | |
Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.9
Apart from the cleanups done by Morimoto-san this has very much been a
driver focused release with very little generic change:
- A big factoring out of the simple-card code to allow it to be shared
more with the rcar generic card from Kuninori Morimoto.
- Removal of some operations duplicated on the CODEC level, again by
Kuninori Morimoto.
- Lots more machine support for x86 systems.
- New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663.
Diffstat (limited to 'drivers/dma/fsl_raid.c')
| -rw-r--r-- | drivers/dma/fsl_raid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c index aad167eaaee8..de2a2a2b1d75 100644 --- a/drivers/dma/fsl_raid.c +++ b/drivers/dma/fsl_raid.c | |||
| @@ -836,6 +836,7 @@ static int fsl_re_probe(struct platform_device *ofdev) | |||
| 836 | rc = of_property_read_u32(np, "reg", &off); | 836 | rc = of_property_read_u32(np, "reg", &off); |
| 837 | if (rc) { | 837 | if (rc) { |
| 838 | dev_err(dev, "Reg property not found in JQ node\n"); | 838 | dev_err(dev, "Reg property not found in JQ node\n"); |
| 839 | of_node_put(np); | ||
| 839 | return -ENODEV; | 840 | return -ENODEV; |
| 840 | } | 841 | } |
| 841 | /* Find out the Job Rings present under each JQ */ | 842 | /* Find out the Job Rings present under each JQ */ |