From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail02a.mail.t-online.hu ([84.2.40.7]:55989 "EHLO mail02a.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647AbZKLIQJ (ORCPT ); Thu, 12 Nov 2009 03:16:09 -0500 Message-ID: <4AFBC44B.1060900@freemail.hu> Date: Thu, 12 Nov 2009 09:16:11 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= MIME-Version: 1.0 To: Hans Verkuil CC: Hans de Goede , Jean-Francois Moine , V4L Mailing List Subject: Re: [PATCH] v4l2-dbg: report fail reason to the user References: <4AF6BA72.4070809@freemail.hu> <4AF8F8EB.8090705@freemail.hu> <4AFBB7FD.5090607@freemail.hu> <200911120829.40193.hverkuil@xs4all.nl> In-Reply-To: <200911120829.40193.hverkuil@xs4all.nl> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Márton Németh Report the fail reason to the user when writing a register even if the verbose mode is switched off. Remove duplicated code ioctl() call which may cause different ioctl() function call in case of verbose and non verbose if not handled carefully. Signed-off-by: Márton Németh --- diff -r 60f784aa071d v4l2-apps/util/v4l2-dbg.cpp --- a/v4l2-apps/util/v4l2-dbg.cpp Wed Nov 11 18:28:53 2009 +0100 +++ b/v4l2-apps/util/v4l2-dbg.cpp Thu Nov 12 09:15:17 2009 +0100 @@ -354,13 +354,14 @@ { int retVal; - if (!options[OptVerbose]) return ioctl(fd, request, parm); retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno)); + else + printf("ok\n"); + } return retVal; } @@ -586,8 +587,8 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: %s\n", + set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }