From patchwork Sun Feb 28 14:19:47 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?b?TsODwqltZXRoIE3Dg8KhcnRvbg==?=
 <nm127@freemail.hu>
X-Patchwork-Id: 82798
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1SEKRsx005837
	for <patchwork-media@patchwork.kernel.org>;
	Sun, 28 Feb 2010 14:20:27 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S968142Ab0B1OUS (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Sun, 28 Feb 2010 09:20:18 -0500
Received: from relay02.digicable.hu ([92.249.128.188]:39958 "EHLO
	relay02.digicable.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S968032Ab0B1OUR (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Sun, 28 Feb 2010 09:20:17 -0500
Received: from [94.21.195.14] by relay02.digicable.hu with esmtpa
	id 1Nljzt-00033X-7n ; Sun, 28 Feb 2010 15:19:53 +0100
Message-ID: <4B8A7B83.8060203@freemail.hu>
Date: Sun, 28 Feb 2010 15:19:47 +0100
From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= <nm127@freemail.hu>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU;
	rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16
MIME-Version: 1.0
To: Kang Yong <kangyong@telegent.com>, Zhang Xiaobing <xbzhang@telegent.com>,
	Huang Shijie <zyziii@telegent.com>, Huang Shijie <shijie8@gmail.com>
CC: V4L Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH] tlg2300: cleanups when power management is not configured
X-Original: 94.21.195.14
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sun, 28 Feb 2010 14:20:27 +0000 (UTC)


diff -r 37581bb7e6f1 linux/drivers/media/video/tlg2300/pd-dvb.c
--- a/linux/drivers/media/video/tlg2300/pd-dvb.c	Wed Feb 24 22:48:50 2010 -0300
+++ b/linux/drivers/media/video/tlg2300/pd-dvb.c	Sun Feb 28 15:13:05 2010 +0100
@@ -96,15 +96,17 @@
 	return ret;
 }

+#ifdef CONFIG_PM
 static void poseidon_fe_release(struct dvb_frontend *fe)
 {
 	struct poseidon *pd = fe->demodulator_priv;

-#ifdef CONFIG_PM
 	pd->pm_suspend = NULL;
 	pd->pm_resume  = NULL;
+}
+#else
+#define poseidon_fe_release NULL
 #endif
-}

 static s32 poseidon_fe_sleep(struct dvb_frontend *fe)
 {
diff -r 37581bb7e6f1 linux/drivers/media/video/tlg2300/pd-video.c
--- a/linux/drivers/media/video/tlg2300/pd-video.c	Wed Feb 24 22:48:50 2010 -0300
+++ b/linux/drivers/media/video/tlg2300/pd-video.c	Sun Feb 28 15:13:05 2010 +0100
@@ -11,8 +11,10 @@
 #include "pd-common.h"
 #include "vendorcmds.h"

+#ifdef CONFIG_PM
 static int pm_video_suspend(struct poseidon *pd);
 static int pm_video_resume(struct poseidon *pd);
+#endif
 static void iso_bubble_handler(struct work_struct *w);

 int usb_transfer_mode;