Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / media / common / saa7146_fops.c

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 5b34c134aa25147dc118a3cc44a3ba49365166f6..127b0526a727f15ac9bf6f570e05ac0f352c08a7 100644 (file)
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -545,11 +545,11 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        if( VFL_TYPE_GRABBER == type ) {
                vv->video_minor = vfd->minor;
                INFO(("%s: registered device video%d [v4l2]\n",
-                       dev->name, vfd->minor & 0x1f));
+                       dev->name, vfd->num));
        } else {
                vv->vbi_minor = vfd->minor;
                INFO(("%s: registered device vbi%d [v4l2]\n",
-                       dev->name, vfd->minor & 0x1f));
+                       dev->name, vfd->num));
        }
 
        *vid = vfd;