From: Juergen Lock <nox@jelal.kn-bremen.de>
Date: Fri, 16 Aug 2013 18:00:24 +0000 (-0300)
Subject: [media] media: rc: rdev->open or rdev->close can be NULL
X-Git-Tag: firefly_0821_release~176^2~3573^2~1391
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f02dcdd1784d2b56ffa8c528248b60ef142e921d;p=firefly-linux-kernel-4.4.55.git

[media] media: rc: rdev->open or rdev->close can be NULL

At least technisat-usb2.c doesn't set these...

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index aa5d8e724622..46da365c9c84 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -711,7 +711,7 @@ int rc_open(struct rc_dev *rdev)
 		return -EINVAL;
 
 	mutex_lock(&rdev->lock);
-	if (!rdev->users++)
+	if (!rdev->users++ && rdev->open != NULL)
 		rval = rdev->open(rdev);
 
 	if (rval)
@@ -735,7 +735,7 @@ void rc_close(struct rc_dev *rdev)
 	if (rdev) {
 		mutex_lock(&rdev->lock);
 
-		 if (!--rdev->users)
+		 if (!--rdev->users && rdev->close != NULL)
 			rdev->close(rdev);
 
 		mutex_unlock(&rdev->lock);