Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c
index 34b31da01d09..786ba85c170b 100644
--- a/drivers/serial/timbuart.c
+++ b/drivers/serial/timbuart.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
+#include <linux/slab.h>
 
 #include "timbuart.h"
 
@@ -421,7 +422,7 @@ static struct uart_driver timbuart_driver = {
 
 static int timbuart_probe(struct platform_device *dev)
 {
-        int err;
+        int err, irq;
         struct timbuart_port *uart;
         struct resource *iomem;
 
@@ -453,11 +454,12 @@ static int timbuart_probe(struct platform_device *dev)
         uart->port.mapbase = iomem->start;
         uart->port.membase = NULL;
 
-        uart->port.irq = platform_get_irq(dev, 0);
-        if (uart->port.irq < 0) {
+        irq = platform_get_irq(dev, 0);
+        if (irq < 0) {
                 err = -EINVAL;
                 goto err_register;
         }
+        uart->port.irq = irq;
 
         tasklet_init(&uart->tasklet, timbuart_tasklet, (unsigned long)uart);