From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908AbcF2TyH (ORCPT ); Wed, 29 Jun 2016 15:54:07 -0400 Received: from lists.s-osg.org ([54.187.51.154]:59228 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751043AbcF2TyG (ORCPT ); Wed, 29 Jun 2016 15:54:06 -0400 Subject: Re: [PATCH 1/6] [media] s5p-mfc: set capablity bus_info as required by VIDIOC_QUERYCAP To: Javier Martinez Canillas , linux-kernel@vger.kernel.org References: <1466113235-25909-1-git-send-email-javier@osg.samsung.com> <1466113235-25909-2-git-send-email-javier@osg.samsung.com> Cc: Mauro Carvalho Chehab , Kamil Debski , Jeongtae Park , Kyungmin Park , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org From: Shuah Khan Message-ID: <577424CC.4080303@osg.samsung.com> Date: Wed, 29 Jun 2016 13:43:08 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1466113235-25909-2-git-send-email-javier@osg.samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/16/2016 03:40 PM, Javier Martinez Canillas wrote: > The driver doesn't set the struct v4l2_capability bus_info field so the > v4l2-compliance tool reports the following errors for VIDIOC_QUERYCAP: > > Required ioctls: > VIDIOC_QUERYCAP returned 0 (Success) > fail: v4l2-compliance.cpp(304): string empty > fail: v4l2-compliance.cpp(528): check_ustring(vcap.bus_info, sizeof(vcap.bus_info)) > test VIDIOC_QUERYCAP: FAIL > > This patch fixes by setting the field in VIDIOC_QUERYCAP ioctl handler: > > Required ioctls: > VIDIOC_QUERYCAP returned 0 (Success) > test VIDIOC_QUERYCAP: OK > > Signed-off-by: Javier Martinez Canillas I started making the very same changes. Looks good. Reviewed-by: Shuah Khan -- Shuah > --- > > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 3 ++- > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > index f2d6376ce618..4a40df22fd63 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -267,7 +267,8 @@ static int vidioc_querycap(struct file *file, void *priv, > > strncpy(cap->driver, dev->plat_dev->name, sizeof(cap->driver) - 1); > strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1); > - cap->bus_info[0] = 0; > + snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", > + dev_name(&dev->plat_dev->dev)); > /* > * This is only a mem-to-mem video device. The capture and output > * device capability flags are left only for backward compatibility > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > index 034b5c1d35a1..dd466ea6429e 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > @@ -945,7 +945,8 @@ static int vidioc_querycap(struct file *file, void *priv, > > strncpy(cap->driver, dev->plat_dev->name, sizeof(cap->driver) - 1); > strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1); > - cap->bus_info[0] = 0; > + snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", > + dev_name(&dev->plat_dev->dev)); > /* > * This is only a mem-to-mem video device. The capture and output > * device capability flags are left only for backward compatibility >