7 files changed, 25 insertions, 9 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 25e1965df7c..d4191fe1ced 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -543,11 +543,10 @@ int parse_chan_pair(char *str, struct line *line, int device,
                     const struct chan_opts *opts, char **error_out)
 {
         struct list_head *chans = &line->chan_list;
-        struct chan *new, *chan;
+        struct chan *new;
         char *in, *out;
 
         if (!list_empty(chans)) {
-                chan = list_entry(chans->next, struct chan, list);
                 free_chan(chans, 0);
                 INIT_LIST_HEAD(chans);
         }
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
index 93f227a25ba..9cbb426c0b9 100644
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -186,7 +186,11 @@ static int absolutize(char *to, int size, char *from)
                 strcat(to, "/");
                 strcat(to, from);
         }
-        chdir(save_cwd);
+        if (chdir(save_cwd)) {
+                cow_printf("absolutize : Can't cd to '%s' - "
+                           "errno = %d\n", save_cwd, errno);
+                return -1;
+        }
         return 0;
 }
 
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index b56f8e0196a..84dce3fc590 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -32,7 +32,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
 {
         struct dog_data data;
         int in_fds[2], out_fds[2], pid, n, err;
-        char pid_buf[sizeof("nnnnn\0")], c;
+        char pid_buf[sizeof("nnnnnnn\0")], c;
         char *pid_args[] = { "/usr/bin/uml_watchdog", "-pid", pid_buf, NULL };
         char *mconsole_args[] = { "/usr/bin/uml_watchdog", "-mconsole", NULL,
                                   NULL };
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 35dd0b86401..d51c404239a 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -176,10 +176,9 @@ void line_flush_buffer(struct tty_struct *tty)
 {
         struct line *line = tty->driver_data;
         unsigned long flags;
-        int err;
 
         spin_lock_irqsave(&line->lock, flags);
-        err = flush_buffer(line);
+        flush_buffer(line);
         spin_unlock_irqrestore(&line->lock, flags);
 }
 
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 47d0c37897d..22745b47c82 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -262,6 +262,15 @@ static int uml_net_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void uml_net_poll_controller(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        uml_net_interrupt(dev->irq, dev);
+        enable_irq(dev->irq);
+}
+#endif
+
 static void uml_net_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
@@ -364,6 +373,9 @@ static const struct net_device_ops uml_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_change_mtu         = uml_net_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = uml_net_poll_controller,
+#endif
 };
 
 /*
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 9415dd9e63e..520118888f1 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -228,7 +228,10 @@ static void change(char *dev, char *what, unsigned char *addr,
                        "buffer\n");
 
         pid = change_tramp(argv, output, output_len);
-        if (pid < 0) return;
+        if (pid < 0) {
+                kfree(output);
+                return;
+        }
 
         if (output != NULL) {
                 printk("%s", output);
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index a1c2d2c98a9..cbacfc4e63e 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -102,7 +102,7 @@ static int slip_tramp(char **argv, int fd)
                        "buffer\n");
                 os_kill_process(pid, 1);
                 err = -ENOMEM;
-                goto out_free;
+                goto out_close;
         }
 
         close(fds[1]);
@@ -112,7 +112,6 @@ static int slip_tramp(char **argv, int fd)
         err = helper_wait(pid);
         close(fds[0]);
 
-out_free:
         kfree(output);
         return err;