summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:09:21 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:09:21 -0600
commit2d702335c770544362affe03bd45cfd32c6d9c0b (patch)
treee38ef6e4f7d56da6c0753cb12856d51275ec37be
parentf08ca89b6e05497be59334aea0f7465d009250b1 (diff)
CR TLSbo91967: Fix FIR functionality after clocking API changes.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-mxc_ir_indent_fix.patch
-rw-r--r--drivers/net/irda/mxc_ir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/mxc_ir.c b/drivers/net/irda/mxc_ir.c
index cfc7a65b9592..763c0f0bf064 100644
--- a/drivers/net/irda/mxc_ir.c
+++ b/drivers/net/irda/mxc_ir.c
@@ -1063,7 +1063,7 @@ void mxc_irda_firi_init(struct mxc_irda *si)
si->firi_clk = clk_get(si->dev, "firi_clk");
firi_baud = clk_round_rate(si->firi_clk, 48004500);
if ((firi_baud < 47995500) ||
- (clk_set_rate(si->firi_clk, firi_baud) < 0)) {
+ (clk_set_rate(si->firi_clk, firi_baud) < 0)) {
dev_err(si->dev, "Unable to set FIR clock to 48MHz.\n");
return;
}
@@ -1529,8 +1529,8 @@ static int mxc_irda_resume(struct platform_device *pdev)
clk_enable(si->uart_clk);
/*Now init FIRI */
- gpio_firi_active(si->firi_base + FIRITCR, FIRITCR_TPP);
- mxc_irda_startup(si);
+ gpio_firi_active(si->firi_base + FIRITCR, FIRITCR_TPP);
+ mxc_irda_startup(si);
/* Enable the UART and FIRI interrupts.. */
local_irq_save(flags);