| From 7ff1614653a079059c1d017d4d95376a616649ab Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 9 May 2012 15:49:57 +0900 |
| Subject: serial8250-em: clk_get() IS_ERR() error handling fix |
| |
| Update the 8250_em driver to correctly handle the case |
| where no clock is associated with the device. |
| |
| The return value of clk_get() needs to be checked with |
| IS_ERR() to avoid NULL pointer referencing. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 94e792ab66d696aad2e52c91bae4cfbeefe4c9f6) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/tty/serial/8250/8250_em.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c |
| index ff42542..be6c289 100644 |
| --- a/drivers/tty/serial/8250/8250_em.c |
| +++ b/drivers/tty/serial/8250/8250_em.c |
| @@ -110,8 +110,9 @@ static int __devinit serial8250_em_probe(struct platform_device *pdev) |
| } |
| |
| priv->sclk = clk_get(&pdev->dev, "sclk"); |
| - if (!priv->sclk) { |
| + if (IS_ERR(priv->sclk)) { |
| dev_err(&pdev->dev, "unable to get clock\n"); |
| + ret = PTR_ERR(priv->sclk); |
| goto err1; |
| } |
| |
| -- |
| 1.7.10.1.362.g242cab3 |
| |
