Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132913
b: refs/heads/master
c: 5706d50
h: refs/heads/master
i:
  132911: 3e6462d
v: v3
  • Loading branch information
David Brownell authored and Mark Brown committed Mar 11, 2009
1 parent 8b811b2 commit 7f05d6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 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: 3c081384007332ab95c8d8753f47719d6646bcb2
refs/heads/master: 5706d5013212c8afcb9fe5332ee6442488280c66
12 changes: 2 additions & 10 deletions trunk/sound/soc/omap/osk5912.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,6 @@ static int __init osk_soc_init(void)
return -ENODEV;
}

if (clk_get_usecount(tlv320aic23_mclk) > 0) {
/* MCLK is already in use */
printk(KERN_WARNING
"MCLK in use at %d Hz. We change it to %d Hz\n",
(uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);
}

/*
* Configure 12 MHz output on MCLK.
*/
Expand All @@ -205,9 +198,8 @@ static int __init osk_soc_init(void)
}
}

printk(KERN_INFO "MCLK = %d [%d], usecount = %d\n",
(uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK,
clk_get_usecount(tlv320aic23_mclk));
printk(KERN_INFO "MCLK = %d [%d]\n",
(uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);

return 0;
err1:
Expand Down

0 comments on commit 7f05d6a

Please sign in to comment.