Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 257473
b: refs/heads/master
c: 2cdcd95
h: refs/heads/master
i:
  257471: 567dfc5
v: v3
  • Loading branch information
Nicolas Ferre authored and Mark Brown committed May 26, 2011
1 parent 63af000 commit 46aac46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97b4fc3c445bf10b6fe0d8543137a6ad30a0fdab
refs/heads/master: 2cdcd951c456fecbeb11fc42aa7d90f172dc58ef
4 changes: 1 addition & 3 deletions trunk/sound/soc/atmel/atmel_ssc_dai.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,10 +838,8 @@ int atmel_ssc_set_audio(int ssc_id)
}

ssc_pdev = platform_device_alloc("atmel-ssc-dai", ssc_id);
if (!ssc_pdev) {
ssc_free(ssc);
if (!ssc_pdev)
return -ENOMEM;
}

/* If we can grab the SSC briefly to parent the DAI device off it */
ssc = ssc_request(ssc_id);
Expand Down

0 comments on commit 46aac46

Please sign in to comment.