Merge commit 'linus/master' into merge-linus

[linux-2.6-omap-h63xx.git] / drivers / serial / cpm_uart / cpm_uart_core.c

diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 25efca5a7a1ffe423b0757f2a89f660390537e20..a6c4d744495e3b694894c35453bbac4a0baff512 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
        if (ret)
                return ret;
 
+       /* initialize the device pointer for the port */
+       pinfo->port.dev = &ofdev->dev;
+
        return uart_add_one_port(&cpm_reg, &pinfo->port);
 }