diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-25 05:34:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-11-29 11:20:06 -0500 |
commit | 89f4d45b2752df5d222b5f63919ce59e2d8afaf4 (patch) | |
tree | 609282c33e05aad1295509b8ff442b0a3e7e070f | |
parent | f8e1b699a5504a2da05834c7cfdddb125a8ce088 (diff) |
[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>
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-core.c | 4 |
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, | |||
1354 | if (fw_debug) { | 1354 | if (fw_debug) { |
1355 | dev->kthread = kthread_run(saa7164_thread_function, dev, | 1355 | dev->kthread = kthread_run(saa7164_thread_function, dev, |
1356 | "saa7164 debug"); | 1356 | "saa7164 debug"); |
1357 | if (!dev->kthread) | 1357 | if (IS_ERR(dev->kthread)) { |
1358 | dev->kthread = NULL; | ||
1358 | printk(KERN_ERR "%s() Failed to create " | 1359 | printk(KERN_ERR "%s() Failed to create " |
1359 | "debug kernel thread\n", __func__); | 1360 | "debug kernel thread\n", __func__); |
1361 | } | ||
1360 | } | 1362 | } |
1361 | 1363 | ||
1362 | } /* != BOARD_UNKNOWN */ | 1364 | } /* != BOARD_UNKNOWN */ |