diff options
| author | Scott Wood <scottwood@freescale.com> | 2009-04-03 15:48:44 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-04-06 09:09:28 -0500 |
| commit | bd86ef378412fc30282daf722a833f734e4e2236 (patch) | |
| tree | a93bd59ef3857747d94808b58f508b8d94c77f2f /drivers/serial/cpm_uart | |
| parent | d91e4ea7047d96733d763f1626f1f21ff4298cef (diff) | |
| download | linux-3.10-bd86ef378412fc30282daf722a833f734e4e2236.tar.gz linux-3.10-bd86ef378412fc30282daf722a833f734e4e2236.tar.bz2 linux-3.10-bd86ef378412fc30282daf722a833f734e4e2236.zip | |
cpm_uart: Initialize port.dev before it's used.
Previously, this caused NULL to sometimes be passed as a device
to the DMA code. With recent DMA changes, that now causes a BUG().
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/serial/cpm_uart')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 5c6ef51da27..4dd00bea191 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c @@ -1339,13 +1339,13 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev, dev_set_drvdata(&ofdev->dev, pinfo); + /* initialize the device pointer for the port */ + pinfo->port.dev = &ofdev->dev; + ret = cpm_uart_init_port(ofdev->node, pinfo); 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); } |