summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-25 06:34:03 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-29 14:20:06 -0200
commit89f4d45b2752df5d222b5f63919ce59e2d8afaf4 (patch)
tree609282c33e05aad1295509b8ff442b0a3e7e070f /drivers/media
parentf8e1b699a5504a2da05834c7cfdddb125a8ce088 (diff)
downloadblackbird-op-linux-89f4d45b2752df5d222b5f63919ce59e2d8afaf4.tar.gz
blackbird-op-linux-89f4d45b2752df5d222b5f63919ce59e2d8afaf4.zip
[media] saa7164: fix return value check in saa7164_initdev()
In case of error, the function kthread_run() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: stable@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/saa7164/saa7164-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 57ef5456f1e8..1bf06970ca3e 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1354,9 +1354,11 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
if (fw_debug) {
dev->kthread = kthread_run(saa7164_thread_function, dev,
"saa7164 debug");
- if (!dev->kthread)
+ if (IS_ERR(dev->kthread)) {
+ dev->kthread = NULL;
printk(KERN_ERR "%s() Failed to create "
"debug kernel thread\n", __func__);
+ }
}
} /* != BOARD_UNKNOWN */
OpenPOWER on IntegriCloud