On Tue, 2013-01-15 at 19:07 -0800, [email protected] wrote: > This is a note to let you know that I've just added the patch titled > > tty: serial: vt8500: fix return value check in vt8500_serial_probe() > > to my tty git tree which can be found at > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git > in the tty-linus branch. > > The patch will show up in the next release of the linux-next tree > (usually sometime within the next 24 hours during the week.) > > The patch will hopefully also be merged in Linus's tree for the > next -rc kernel release. > > If you have any questions about this process, please let me know. > > > >From a6dd114e16cbc4410049a90a8a67b967333d108d Mon Sep 17 00:00:00 2001 > From: Wei Yongjun <[email protected]> > Date: Sun, 2 Dec 2012 05:10:44 -0500 > Subject: tty: serial: vt8500: fix return value check in vt8500_serial_probe() > > 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: Tony Prisk <[email protected]> > Cc: stable <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > --- > drivers/tty/serial/vt8500_serial.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/vt8500_serial.c > b/drivers/tty/serial/vt8500_serial.c > index 8fd1814..d5ed9f6 100644 > --- a/drivers/tty/serial/vt8500_serial.c > +++ b/drivers/tty/serial/vt8500_serial.c > @@ -604,7 +604,7 @@ static int vt8500_serial_probe(struct platform_device > *pdev) > vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; > > vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); > - if (vt8500_port->clk) { > + if (!IS_ERR(vt8500_port->clk)) { > vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); > } else { > /* use the default of 24Mhz if not specified and warn */
This patch is going to cause some kind of mess with the patch series I already sent which alters/removes the same code. Not sure how big a problem, or how long this patch has been around for. Regards Tony P -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
