From patchwork Fri May 18 19:32:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 11325 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SVSvC-00012k-TM for patchwork@linuxtv.org; Fri, 18 May 2012 21:33:06 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SVSvC-0007dx-AV; Fri, 18 May 2012 21:33:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967013Ab2ERTdD (ORCPT ); Fri, 18 May 2012 15:33:03 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:51417 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967003Ab2ERTdB (ORCPT ); Fri, 18 May 2012 15:33:01 -0400 Received: by bkcji2 with SMTP id ji2so2627598bkc.19 for ; Fri, 18 May 2012 12:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Q3QfNWSgEp81cqPphbQ9hbXYF1EtFg985HGSAp5wpK4=; b=o+rZF4Yx5jRySN2yOwyXhO16ZOlm5iMkHMbvaeHuR5shq5YbQS/iO8jltxnGtOIo5j WF1n2twZHw90PuGV5a3lKLIomn/c54cBcWd1wCSqmVN2knrTOFHrmWRt/lWjaOuqGxwf RhYmRweBVS74uksJAm1614xwNZiIaUBuggIbIgxaEldUzPdpJqv3gbuxY3pCpfFtFgnP 87AbMZNsyfIhhx9Ov21Lg2exn4xd1pVdxBKxkKjw5tDpSMf0FTDAZKJqz7/hv3hCh09Q d1t01H4GV98a9hr3ZsLpZWjlGhc1eol/a5qKnCBMAK3/aaRD8y0IEMvFH+ZKEQQKPlaW zwqA== Received: by 10.205.132.13 with SMTP id hs13mr4617384bkc.78.1337369580306; Fri, 18 May 2012 12:33:00 -0700 (PDT) Received: from [192.168.1.110] (031011252076.warszawa.vectranet.pl. [31.11.252.76]) by mx.google.com with ESMTPS id n17sm18995557bkw.5.2012.05.18.12.32.58 (version=SSLv3 cipher=OTHER); Fri, 18 May 2012 12:32:59 -0700 (PDT) Message-ID: <4FB6A3E9.3000804@gmail.com> Date: Fri, 18 May 2012 21:32:57 +0200 From: Sylwester Nawrocki User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Hans Verkuil CC: linux-media@vger.kernel.org, Hans de Goede Subject: Re: [GIT PULL FOR v3.5] Fix gspca compile error if CONFIG_PM is not set References: <201205181343.46414.hverkuil@xs4all.nl> In-Reply-To: <201205181343.46414.hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.18.192415 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' Hi Hans, On 05/18/2012 01:43 PM, Hans Verkuil wrote: > The field 'frozen' is only there if CONFIG_PM is set, so don't use it > directly, always check for CONFIG_PM first. If it is safe to assume that for !CONFIG_PM the field 'frozen' is always zero, wouldn't it be better to create a macro in a header file, something like: #ifdef CONFIG_PM #define gspca_pm_frozen(__dev) ((__dev)->frozen) #else #define gspca_pm_frozen(__dev) (0) #endif and use it instead ? > Regards, > > Hans > > The following changes since commit 61282daf505f3c8def09332ca337ac257b792029: > > [media] V4L2: mt9t112: fixup JPEG initialization workaround (2012-05-15 16:15:35 -0300) > > are available in the git repository at: > > git://linuxtv.org/hverkuil/media_tree.git frozenfix > > for you to fetch changes up to 4ba342204948e9df49dc1f639ffdbfe49579e626: > > gspca: the field 'frozen' is under CONFIG_PM (2012-05-18 13:40:42 +0200) > > ---------------------------------------------------------------- > Hans Verkuil (1): > gspca: the field 'frozen' is under CONFIG_PM > > drivers/media/video/gspca/finepix.c | 20 +++++++++++++++----- > drivers/media/video/gspca/jl2005bcd.c | 6 +++++- > drivers/media/video/gspca/sq905.c | 6 +++++- > drivers/media/video/gspca/sq905c.c | 6 +++++- > drivers/media/video/gspca/vicam.c | 6 +++++- > drivers/media/video/gspca/zc3xx.c | 7 +++++-- > 6 files changed, 40 insertions(+), 11 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c index a144ce7..04f5465 100644 (file) --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/video/gspca/sq905.c @@ -232,7 +232,11 @@ static void sq905_dostream(struct work_struct *work) frame_sz = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].sizeimage + FRAME_HEADER_LEN; - while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) { + while (!gspca_pm_frozen(gspca_dev) && gspca_dev->dev && gspca_dev->streaming) { I really hate #ifdefs ... :-) -- Regards, Sylwester