V4L/DVB: gspca - sn9c20x: Add another MSI laptop to upsidedown device list

[safe/jmp/linux-2.6] / drivers / char / hvc_iseries.c

diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index b74a2f8..21c5495 100644 (file)
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -197,7 +197,7 @@ done:
        return sent;
 }
 
-static struct hv_ops hvc_get_put_ops = {
+static const struct hv_ops hvc_get_put_ops = {
        .get_chars = get_chars,
        .put_chars = put_chars,
        .notifier_add = notifier_add_irq,
@@ -241,7 +241,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 static struct vio_driver hvc_vio_driver = {
        .id_table       = hvc_driver_table,
        .probe          = hvc_vio_probe,
-       .remove         = hvc_vio_remove,
+       .remove         = __devexit_p(hvc_vio_remove),
        .driver         = {
                .name   = hvc_driver_name,
                .owner  = THIS_MODULE,
@@ -353,7 +353,7 @@ static void hvc_close_event(struct HvLpEvent *event)
 
        if (!hvlpevent_is_int(event)) {
                printk(KERN_WARNING
-                       "hvc: got unexpected close acknowlegement\n");
+                       "hvc: got unexpected close acknowledgement\n");
                return;
        }
 
@@ -575,8 +575,10 @@ static int __init hvc_find_vtys(void)
                 * of console adapters.
                 */
                if ((num_found >= MAX_NR_HVC_CONSOLES) ||
-                               (num_found >= VTTY_PORTS))
+                               (num_found >= VTTY_PORTS)) {
+                       of_node_put(vty);
                        break;
+               }
 
                vtermno = of_get_property(vty, "reg", NULL);
                if (!vtermno)