On Sun, Dec 02, 2012 at 05:12:43AM -0500, Wei Yongjun wrote: > From: Wei Yongjun <[email protected]> > > In case of error, function of_clk_get() returns ERR_PTR() > and never returns NULL. The NULL test in the return value > check should be replaced with IS_ERR(). > > Signed-off-by: Wei Yongjun <[email protected]> > Acked-by: Grant Likely <[email protected]> > > > --- > drivers/tty/serial/xilinx_uartps.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/tty/serial/xilinx_uartps.c > b/drivers/tty/serial/xilinx_uartps.c > index 2be22a2..1eb4657 100644 > --- a/drivers/tty/serial/xilinx_uartps.c > +++ b/drivers/tty/serial/xilinx_uartps.c > @@ -948,9 +948,9 @@ static int xuartps_probe(struct platform_device *pdev) > struct clk *clk; > > clk = of_clk_get(pdev->dev.of_node, 0); > - if (!clk) { > + if (IS_ERR(clk)) { > dev_err(&pdev->dev, "no clock specified\n"); > - return -ENODEV; > + return PTR_ERR(clk); > }
This patch doesn't apply at all to my tree, what am I doing wrong? greg k-h _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
