diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:40:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:40:35 -0700 |
| commit | 9262e9149f346a5443300f8c451b8e7631e81a42 (patch) | |
| tree | f21b2d6f9270c7d0ff807f070e38d0f665582f21 /drivers/serial/sunsu.c | |
| parent | e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb (diff) | |
| parent | 6e990b50ed0b45d506ff6809034508d3e210497d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Kill sun4v virtual device layer.
[SERIAL] sunhv: Convert to of_driver layer.
[SPARC64]: Mask out top 8-bits in physical address when building resources.
[SERIAL] sunsu: Missing return statement in su_probe().
Diffstat (limited to 'drivers/serial/sunsu.c')
| -rw-r--r-- | drivers/serial/sunsu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 72c86d0017f..eabf477fee9 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1438,6 +1438,8 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m err = sunsu_kbd_ms_init(up); if (err) goto out_unmap; + + return 0; } up->port.flags |= UPF_BOOT_AUTOCONF; |