diff options
Diffstat (limited to 'drivers/media/video/mxb.c')
-rw-r--r-- | drivers/media/video/mxb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index f68e91fbe7fb..8ef578caba3b 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
@@ -931,27 +931,29 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) | |||
931 | return 0; | 931 | return 0; |
932 | } | 932 | } |
933 | 933 | ||
934 | static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) | 934 | static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standard) |
935 | { | 935 | { |
936 | struct mxb* mxb = (struct mxb*)dev->ext_priv; | 936 | struct mxb *mxb = (struct mxb *)dev->ext_priv; |
937 | int zero = 0; | 937 | int zero = 0; |
938 | int one = 1; | 938 | int one = 1; |
939 | 939 | ||
940 | if(V4L2_STD_PAL_I == std->id ) { | 940 | if (V4L2_STD_PAL_I == standard->id) { |
941 | v4l2_std_id std = V4L2_STD_PAL_I; | 941 | v4l2_std_id std = V4L2_STD_PAL_I; |
942 | |||
942 | DEB_D(("VIDIOC_S_STD: setting mxb for PAL_I.\n")); | 943 | DEB_D(("VIDIOC_S_STD: setting mxb for PAL_I.\n")); |
943 | /* set the 7146 gpio register -- I don't know what this does exactly */ | 944 | /* set the 7146 gpio register -- I don't know what this does exactly */ |
944 | saa7146_write(dev, GPIO_CTRL, 0x00404050); | 945 | saa7146_write(dev, GPIO_CTRL, 0x00404050); |
945 | /* unset the 7111 gpio register -- I don't know what this does exactly */ | 946 | /* unset the 7111 gpio register -- I don't know what this does exactly */ |
946 | mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_GPIO, &zero); | 947 | mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &zero); |
947 | mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std); | 948 | mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std); |
948 | } else { | 949 | } else { |
949 | v4l2_std_id std = V4L2_STD_PAL_BG; | 950 | v4l2_std_id std = V4L2_STD_PAL_BG; |
951 | |||
950 | DEB_D(("VIDIOC_S_STD: setting mxb for PAL/NTSC/SECAM.\n")); | 952 | DEB_D(("VIDIOC_S_STD: setting mxb for PAL/NTSC/SECAM.\n")); |
951 | /* set the 7146 gpio register -- I don't know what this does exactly */ | 953 | /* set the 7146 gpio register -- I don't know what this does exactly */ |
952 | saa7146_write(dev, GPIO_CTRL, 0x00404050); | 954 | saa7146_write(dev, GPIO_CTRL, 0x00404050); |
953 | /* set the 7111 gpio register -- I don't know what this does exactly */ | 955 | /* set the 7111 gpio register -- I don't know what this does exactly */ |
954 | mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_GPIO, &one); | 956 | mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &one); |
955 | mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std); | 957 | mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std); |
956 | } | 958 | } |
957 | return 0; | 959 | return 0; |