diff options
| author | Juergen Lock <nox@jelal.kn-bremen.de> | 2013-08-16 22:00:24 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-23 12:41:23 +0400 |
| commit | f02dcdd1784d2b56ffa8c528248b60ef142e921d (patch) | |
| tree | 3d9209cf417a8251e98fbb5729e5cc55f29605c4 /drivers/media | |
| parent | 5be789fc84a752946f6bdf263b053ed7d4a12a1c (diff) | |
| download | linux-f02dcdd1784d2b56ffa8c528248b60ef142e921d.tar.xz | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |