On 02/20/2013 05:26 PM, Pawel Wieczorkiewicz : > From: Pawel Wieczorkiewicz <[email protected]> > > Index of atmel_ports[ATMEL_MAX_UART] should be smaller > than ATMEL_MAX_UART. > > Signed-off-by: Pawel Wieczorkiewicz <[email protected]>
Acked-by: Nicolas Ferre <[email protected]> It can be good to include this one in 3.9-rc. I also would like to add the "stable" tag to it: Cc: stable <[email protected]> # 3.2+ Greg, can you take this one or do I need to re-send it with appropriate "stable" line? Thanks, best regards, > --- > drivers/tty/serial/atmel_serial.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c > b/drivers/tty/serial/atmel_serial.c > index d4a7c24..3467462 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -158,7 +158,7 @@ struct atmel_uart_port { > }; > > static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART]; > -static unsigned long atmel_ports_in_use; > +static DECLARE_BITMAP(atmel_ports_in_use, ATMEL_MAX_UART); > > #ifdef SUPPORT_SYSRQ > static struct console atmel_console; > @@ -1769,15 +1769,14 @@ static int atmel_serial_probe(struct platform_device > *pdev) > if (ret < 0) > /* port id not found in platform data nor device-tree aliases: > * auto-enumerate it */ > - ret = find_first_zero_bit(&atmel_ports_in_use, > - sizeof(atmel_ports_in_use)); > + ret = find_first_zero_bit(atmel_ports_in_use, ATMEL_MAX_UART); > > - if (ret > ATMEL_MAX_UART) { > + if (ret >= ATMEL_MAX_UART) { > ret = -ENODEV; > goto err; > } > > - if (test_and_set_bit(ret, &atmel_ports_in_use)) { > + if (test_and_set_bit(ret, atmel_ports_in_use)) { > /* port already in use */ > ret = -EBUSY; > goto err; > @@ -1857,7 +1856,7 @@ static int atmel_serial_remove(struct platform_device > *pdev) > > /* "port" is allocated statically, so we shouldn't free it */ > > - clear_bit(port->line, &atmel_ports_in_use); > + clear_bit(port->line, atmel_ports_in_use); > > clk_put(atmel_port->clk); > > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
