From 2d4f6d4a26ae75e651542d2110301713af38648e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 28 Mar 2010 08:29:35 -0300 Subject: [PATCH] --- yaml --- r: 192977 b: refs/heads/master c: a9fac6b1487aea9f5aaefe93def522fab477f5dc h: refs/heads/master i: 192975: fe151751281ca23925660003b438db084922c97b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-core.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index de87d9576951..4a9565d33882 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a67b5cc6f6ae37500b8f41fd52628395f7276a8 +refs/heads/master: a9fac6b1487aea9f5aaefe93def522fab477f5dc diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-core.c b/trunk/drivers/media/video/cx231xx/cx231xx-core.c index b24eee115e7e..f5e1a2315fcc 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-core.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-core.c @@ -96,10 +96,9 @@ int cx231xx_register_extension(struct cx231xx_ops *ops) mutex_lock(&cx231xx_devlist_mutex); mutex_lock(&cx231xx_extension_devlist_lock); list_add_tail(&ops->next, &cx231xx_extension_devlist); - list_for_each_entry(dev, &cx231xx_devlist, devlist) { - if (dev) - ops->init(dev); - } + list_for_each_entry(dev, &cx231xx_devlist, devlist) + ops->init(dev); + printk(KERN_INFO DRIVER_NAME ": %s initialized\n", ops->name); mutex_unlock(&cx231xx_extension_devlist_lock); mutex_unlock(&cx231xx_devlist_mutex); @@ -112,10 +111,8 @@ void cx231xx_unregister_extension(struct cx231xx_ops *ops) struct cx231xx *dev = NULL; mutex_lock(&cx231xx_devlist_mutex); - list_for_each_entry(dev, &cx231xx_devlist, devlist) { - if (dev) - ops->fini(dev); - } + list_for_each_entry(dev, &cx231xx_devlist, devlist) + ops->fini(dev); mutex_lock(&cx231xx_extension_devlist_lock); printk(KERN_INFO DRIVER_NAME ": %s removed\n", ops->name);