From: Hans Verkuil Date: Sat, 14 Dec 2013 11:28:37 +0000 (-0300) Subject: upstream: [media] saa7134: don't set vfd->debug X-Git-Tag: submit/tizen/20141121.110247~1557 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8f0a4e11db4a90d020d4dfe507b36343b042557;p=platform%2Fkernel%2Flinux-3.10.git upstream: [media] saa7134: don't set vfd->debug You can set this through sysfs, so don't mix the two. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c index 27d7ee7..d0dbf15 100644 --- a/drivers/media/pci/saa7134/saa7134-core.c +++ b/drivers/media/pci/saa7134/saa7134-core.c @@ -802,7 +802,6 @@ static struct video_device *vdev_init(struct saa7134_dev *dev, *vfd = *template; vfd->v4l2_dev = &dev->v4l2_dev; vfd->release = video_device_release; - vfd->debug = video_debug; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type, saa7134_boards[dev->board].name); set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);