Merge branch 'topic/soundcore-preclaim' into for-linus

[pandora-kernel.git] / drivers / media / video / hdpvr / hdpvr-video.c

diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index 3e6ffee..d678765 100644 (file)
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -181,7 +181,7 @@ static int hdpvr_submit_buffers(struct hdpvr_device *dev)
                                 buff_list);
                if (buf->status != BUFSTAT_AVAILABLE) {
                        v4l2_err(&dev->v4l2_dev,
-                                "buffer not marked as availbale\n");
+                                "buffer not marked as available\n");
                        ret = -EFAULT;
                        goto err;
                }
@@ -1220,6 +1220,8 @@ static const struct video_device hdpvr_video_template = {
                V4L2_STD_PAL_G | V4L2_STD_PAL_H | V4L2_STD_PAL_I |
                V4L2_STD_PAL_D | V4L2_STD_PAL_M | V4L2_STD_PAL_N |
                V4L2_STD_PAL_60,
+       .current_norm           = V4L2_STD_NTSC | V4L2_STD_PAL_M |
+               V4L2_STD_PAL_60,
 };
 
 int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,