diff options
| author | Li Haifeng <omycle@gmail.com> | 2011-06-10 09:22:58 +0800 |
|---|---|---|
| committer | Li Haifeng <omycle@gmail.com> | 2011-06-10 09:27:42 +0800 |
| commit | 171572d0d3fd231bd4e1c71645c9e206a570a46c (patch) | |
| tree | 634e4734f2cb741570665527ab7bd4ebde48b6c4 | |
| parent | 95347fcbe58b521d08b132e0d109beed7d4f11b5 (diff) | |
| download | qemu-android-goldfish-2.6.29.tar.gz | |
tty: goldfish: Fix wrong behavior when tty device was probedandroid-goldfish-2.6.29
Fix wrong behavior when tty device registration failed.
Change-Id: Icf001b319934286c330532475f4c423274764390
Signed-off-by: Li Haifeng <omycle@gmail.com>
| -rw-r--r-- | drivers/char/goldfish_tty.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/goldfish_tty.c b/drivers/char/goldfish_tty.c index a0b9a75e9f9..8a3b5cbb662 100644 --- a/drivers/char/goldfish_tty.c +++ b/drivers/char/goldfish_tty.c @@ -220,7 +220,6 @@ static void goldfish_tty_delete_driver(void) static int __devinit goldfish_tty_probe(struct platform_device *pdev) { int ret; - int i; struct resource *r; struct device *ttydev; void __iomem *base; @@ -280,8 +279,8 @@ static int __devinit goldfish_tty_probe(struct platform_device *pdev) return 0; - tty_unregister_device(goldfish_tty_driver, i); err_tty_register_device_failed: + tty_unregister_device(goldfish_tty_driver, pdev->id); free_irq(irq, pdev); err_request_irq_failed: goldfish_tty_current_line_count--; |