diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
| commit | 43c1881110b28f42c58d45465a6b8cad06540ad0 (patch) | |
| tree | 4b964b15e2ed7e6acd6e375c39e575348fd988a2 /drivers/serial/amba-pl011.c | |
| parent | 849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff) | |
| parent | 81d2b141e709505fcdf9a6c4df160894ddf28667 (diff) | |
| download | barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'drivers/serial/amba-pl011.c')
| -rw-r--r-- | drivers/serial/amba-pl011.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 07508d03b0..bc9b0def8e 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -34,6 +34,7 @@ #include <asm/io.h> #include <linux/amba/serial.h> #include <linux/clk.h> +#include <linux/err.h> /* * We wrap our port structure around the generic console_device. @@ -160,6 +161,9 @@ static int pl011_probe(struct device_d *dev) uart->clk = clk_get(dev, NULL); + if (IS_ERR(uart->clk)) + return PTR_ERR(uart->clk); + cdev = &uart->uart; dev->type_data = cdev; cdev->dev = dev; |