diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 14:36:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 14:36:23 -0800 |
| commit | df953944fb5fa26a6371538ba70c9a265b2fe677 (patch) | |
| tree | de9a5d9ac044ce06423be1f93f958effff51ad6d /tty | |
| parent | 912ae66b952e249f66eef23a545e572263f989b8 (diff) | |
| download | patches-df953944fb5fa26a6371538ba70c9a265b2fe677.tar.gz | |
driver core, usb, and tty patches
Diffstat (limited to 'tty')
| -rw-r--r-- | tty/serial-bcm63xx_uart-allow-more-than-one-uart-to-be-registered.patch | 46 | ||||
| -rw-r--r-- | tty/serial-bcm63xx_uart-don-t-use-kfree-on-non-kmalloced-area.patch | 27 |
2 files changed, 73 insertions, 0 deletions
diff --git a/tty/serial-bcm63xx_uart-allow-more-than-one-uart-to-be-registered.patch b/tty/serial-bcm63xx_uart-allow-more-than-one-uart-to-be-registered.patch new file mode 100644 index 00000000000000..bf79b367eef240 --- /dev/null +++ b/tty/serial-bcm63xx_uart-allow-more-than-one-uart-to-be-registered.patch @@ -0,0 +1,46 @@ +From mbizon@freebox.fr Mon Feb 1 14:28:41 2010 +From: Maxime Bizon <mbizon@freebox.fr> +Date: Sat, 30 Jan 2010 18:42:57 +0100 +Subject: serial: bcm63xx_uart: allow more than one uart to be registered. +To: Greg Kroah-Hartman <gregkh@suse.de>, linux-serial@vger.kernel.org +Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Maxime Bizon <mbizon@freebox.fr> +Message-ID: <1264873377-28479-3-git-send-email-mbizon@freebox.fr> + + +The bcm6358 CPU has two uarts, make it possible to use the second one. + +Signed-off-by: Maxime Bizon <mbizon@freebox.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/serial/bcm63xx_uart.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/serial/bcm63xx_uart.c ++++ b/drivers/serial/bcm63xx_uart.c +@@ -35,7 +35,7 @@ + #include <bcm63xx_regs.h> + #include <bcm63xx_io.h> + +-#define BCM63XX_NR_UARTS 1 ++#define BCM63XX_NR_UARTS 2 + + static struct uart_port ports[BCM63XX_NR_UARTS]; + +@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_drive + .dev_name = "ttyS", + .major = TTY_MAJOR, + .minor = 64, +- .nr = 1, ++ .nr = BCM63XX_NR_UARTS, + .cons = BCM63XX_CONSOLE, + }; + +@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(stru + port->dev = &pdev->dev; + port->fifosize = 16; + port->uartclk = clk_get_rate(clk) / 2; ++ port->line = pdev->id; + clk_put(clk); + + ret = uart_add_one_port(&bcm_uart_driver, port); diff --git a/tty/serial-bcm63xx_uart-don-t-use-kfree-on-non-kmalloced-area.patch b/tty/serial-bcm63xx_uart-don-t-use-kfree-on-non-kmalloced-area.patch new file mode 100644 index 00000000000000..b7292cc52862c7 --- /dev/null +++ b/tty/serial-bcm63xx_uart-don-t-use-kfree-on-non-kmalloced-area.patch @@ -0,0 +1,27 @@ +From mbizon@freebox.fr Mon Feb 1 14:30:29 2010 +From: Maxime Bizon <mbizon@freebox.fr> +Date: Sat, 30 Jan 2010 18:42:56 +0100 +Subject: serial: bcm63xx_uart: don't use kfree() on non kmalloced area. +To: Greg Kroah-Hartman <gregkh@suse.de>, linux-serial@vger.kernel.org +Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Maxime Bizon <mbizon@freebox.fr> +Message-ID: <1264873377-28479-2-git-send-email-mbizon@freebox.fr> + + +Signed-off-by: Maxime Bizon <mbizon@freebox.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/serial/bcm63xx_uart.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/serial/bcm63xx_uart.c ++++ b/drivers/serial/bcm63xx_uart.c +@@ -830,7 +830,7 @@ static int __devinit bcm_uart_probe(stru + + ret = uart_add_one_port(&bcm_uart_driver, port); + if (ret) { +- kfree(port); ++ ports[pdev->id].membase = 0; + return ret; + } + platform_set_drvdata(pdev, port); |