V4L/DVB (9586): Fix possible null pointer dereference in info message

Fix case where we could end up dereferencing a NULL pointer if dev->vdev or
dev->vbi_dev were not set properly.

Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 415dff830f88..e8edeecf367d 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1600,8 +1600,6 @@ static void em28xx_release_resources(struct em28xx *dev)
 
         /*FIXME: I2C IR should be disconnected */
 
-        em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
-                                dev->vdev->num, dev->vbi_dev->num);
         list_del(&dev->devlist);
         if (dev->sbutton_input_dev)
                 em28xx_deregister_snapshot_button(dev);
@@ -1613,6 +1611,8 @@ static void em28xx_release_resources(struct em28xx *dev)
                 dev->radio_dev = NULL;
         }
         if (dev->vbi_dev) {
+                em28xx_info("V4L2 device /dev/vbi%d deregistered\n",
+                            dev->vbi_dev->num);
                 if (-1 != dev->vbi_dev->minor)
                         video_unregister_device(dev->vbi_dev);
                 else
@@ -1620,6 +1620,8 @@ static void em28xx_release_resources(struct em28xx *dev)
                 dev->vbi_dev = NULL;
         }
         if (dev->vdev) {
+                em28xx_info("V4L2 device /dev/video%d deregistered\n",
+                            dev->vdev->num);
                 if (-1 != dev->vdev->minor)
                         video_unregister_device(dev->vdev);
                 else