From 97760d99c15e26a4164e456c2f111295d9fd5e3c Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 20 Sep 2012 21:13:55 +0000 Subject: [PATCH] --- yaml --- r: 323101 b: refs/heads/master c: dc9c9759ebc65d886453c335b2b5be39f87ab01e h: refs/heads/master i: 323099: 6ed6d755e23d05cc96fdc841a49d7381e6d01926 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/sh_sir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25f523ae161b..d86054a5ed18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6861509f9fee9c5e568c5f6852bb96f2475b4179 +refs/heads/master: dc9c9759ebc65d886453c335b2b5be39f87ab01e diff --git a/trunk/drivers/net/irda/sh_sir.c b/trunk/drivers/net/irda/sh_sir.c index 256eddf1f75a..795109425568 100644 --- a/trunk/drivers/net/irda/sh_sir.c +++ b/trunk/drivers/net/irda/sh_sir.c @@ -280,7 +280,7 @@ static int sh_sir_set_baudrate(struct sh_sir_self *self, u32 baudrate) } clk = clk_get(NULL, "irda_clk"); - if (!clk) { + if (IS_ERR(clk)) { dev_err(dev, "can not get irda_clk\n"); return -EIO; }