V4L/DVB (8630): First mxb cleanup phase

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 8ef578caba3b..7c9820c72a6f 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -466,15 +466,15 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
         /* checking for i2c-devices can be omitted here, because we
            already did this in "mxb_vl42_probe" */
 
-        saa7146_vv_init(dev,&vv_data);
-        if( 0 != saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
+        saa7146_vv_init(dev, &vv_data);
+        if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
                 ERR(("cannot register capture v4l2 device. skipping.\n"));
                 return -1;
         }
 
         /* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
-        if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
-                if( 0 != saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
+        if (MXB_BOARD_CAN_DO_VBI(dev)) {
+                if (saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
                         ERR(("cannot register vbi v4l2 device. skipping.\n"));
                 }
         }
@@ -486,7 +486,7 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
         i2c_use_client(mxb->saa7111a);
         i2c_use_client(mxb->tuner);
 
-        printk("mxb: found 'Multimedia eXtension Board'-%d.\n",mxb_num);
+        printk("mxb: found Multimedia eXtension Board #%d.\n", mxb_num);
 
         mxb_num++;
         mxb_init_done(dev);
@@ -737,8 +737,8 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index));
 
                 memset(t,0,sizeof(*t));
-                strcpy(t->name, "Television");
 
+                strlcpy(t->name, "Television", sizeof(t->name));
                 t->type = V4L2_TUNER_ANALOG_TV;
                 t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
                 t->rangelow = 772;      /* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */
@@ -746,7 +746,6 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 /* FIXME: add the real signal strength here */
                 t->signal = 0xffff;
                 t->afc = 0;
-
                 mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, &byte);
                 t->audmode = mxb->cur_mode;