On Thu, Mar 20, 2008 at 8:43 AM, John Linn <[EMAIL PROTECTED]> wrote: > From: Stephen Neuendorffer <[EMAIL PROTECTED]> > > The of_serial driver queries the current-speed property and attempts > to use it to register the custom_divisor property of the uart_port. > However, if current-speed is not set, then this code will dereference > a bad pointer. The fix is to only set custom_divisor when a > current-speed property appears in the device tree. > > Signed-off-by: Stephen Neuendorffer <[EMAIL PROTECTED]> > Signed-off-by: John Linn <[EMAIL PROTECTED]>
This looks correct and appropriate to me. Acked-by: Grant Likely <[EMAIL PROTECTED]> Josh/Arnd, could either of you pick this up? Cheers, g. > --- > drivers/serial/of_serial.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c > index a64d858..2efb892 100644 > --- a/drivers/serial/of_serial.c > +++ b/drivers/serial/of_serial.c > @@ -56,7 +56,9 @@ static int __devinit of_platform_serial_setup(struct > of_device *ofdev, > port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP > | UPF_FIXED_PORT; > port->dev = &ofdev->dev; > - port->custom_divisor = *clk / (16 * (*spd)); > + /* If current-speed was set, then try not to change it. */ > + if (spd) > + port->custom_divisor = *clk / (16 * (*spd)); > > return 0; > } > -- > 1.5.2.1 > > > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@ozlabs.org > https://ozlabs.org/mailman/listinfo/linuxppc-dev > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
