1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 474ddb779643..bacb311b4f24 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -535,9 +535,9 @@ static int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
 
         dma_q->kthread = kthread_run(vivi_thread, dma_q, "vivi");
 
-        if (dma_q->kthread == NULL) {
+        if (IS_ERR(dma_q->kthread)) {
                 printk(KERN_ERR "vivi: kernel_thread() failed\n");
-                return -EINVAL;
+                return PTR_ERR(dma_q->kthread);
         }
         dprintk(1,"returning from %s\n",__FUNCTION__);
         return 0;
@@ -1363,7 +1363,9 @@ static void __exit vivi_exit(void)
         struct vivi_dev *h;
         struct list_head *list;
 
-        list_for_each(list,&vivi_devlist) {
+        while (!list_empty(&vivi_devlist)) {
+                list = vivi_devlist.next;
+                list_del(list);
                 h = list_entry(list, struct vivi_dev, vivi_devlist);
                 kfree (h);
         }