diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-22 20:00:11 +0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-22 20:00:11 +0400 |
| commit | 5dbd6535d5bcb9d1899dd27d209ca651431df66b (patch) | |
| tree | 137231cd0e8e01a30e4946625836d512db6830e7 /drivers/tty/serial/msm_smd_tty.c | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) | |
| download | linux-5dbd6535d5bcb9d1899dd27d209ca651431df66b.tar.xz | |
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
Diffstat (limited to 'drivers/tty/serial/msm_smd_tty.c')
| -rw-r--r-- | drivers/tty/serial/msm_smd_tty.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c index b25e6ee71443..925d1fa153db 100644 --- a/drivers/tty/serial/msm_smd_tty.c +++ b/drivers/tty/serial/msm_smd_tty.c @@ -223,9 +223,11 @@ static int __init smd_tty_init(void) return ret; for (i = 0; i < smd_tty_channels_len; i++) { - tty_port_init(&smd_tty[smd_tty_channels[i].id].port); - smd_tty[smd_tty_channels[i].id].port.ops = &smd_tty_port_ops; - tty_register_device(smd_tty_driver, smd_tty_channels[i].id, 0); + struct tty_port *port = &smd_tty[smd_tty_channels[i].id].port; + tty_port_init(port); + port->ops = &smd_tty_port_ops; + tty_port_register_device(port, smd_tty_driver, + smd_tty_channels[i].id, NULL); } return 0; |