diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 10:42:59 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 10:42:59 -0500 |
| commit | 57260e4088894de25bb1837d529708c3ec705a69 (patch) | |
| tree | e7072aed15b203197549099371db55c5d4bc3c0a /sound/core/oss/pcm_oss.c | |
| parent | 2d4d07b97c0b774ea9ce2a2105818208d3df7241 (diff) | |
| parent | 3d5e2abe6e265acc5e1fda810301243e9bac92b2 (diff) | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX fixes for 3.7-rc
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: ehci: fix host power mask bit
ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index f337b66a020b..4c1cc51772e6 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
| @@ -2454,6 +2454,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) | |||
| 2454 | mutex_unlock(&pcm->open_mutex); | 2454 | mutex_unlock(&pcm->open_mutex); |
| 2455 | if (err < 0) | 2455 | if (err < 0) |
| 2456 | goto __error; | 2456 | goto __error; |
| 2457 | snd_card_unref(pcm->card); | ||
| 2457 | return err; | 2458 | return err; |
| 2458 | 2459 | ||
| 2459 | __error: | 2460 | __error: |