From fed87b40ef0596d23b6ec6e518b3f32702b2bd60 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:45:39 -0300
Subject: [PATCH] --- yaml --- r: 92439 b: refs/heads/master c:
 e1edb19a001b25c0ce2e52a669cba6b6eb31883c h: refs/heads/master i:   92437:
 0ff878a35b7b8b2a683e8589f02fcf00f5acf79b   92435:
 317f86db99df8f8062698414e1338bb85ef02788   92431:
 8c7e33be2f14540aa4fd4ae80b42797399a7178a v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 23 +++++++++++++++----
 .../drivers/media/video/pvrusb2/pvrusb2-hdw.h |  3 +++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6688a1589739..46010a4f9a44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc40a0e582a88d2561d13d1fea4f3496bff9650
+refs/heads/master: e1edb19a001b25c0ce2e52a669cba6b6eb31883c
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index ae36948c6c1d..9408e8db98ef 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3193,17 +3193,32 @@ int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *hdw)
 }
 
 
-int pvr2_hdw_cmd_powerup(struct pvr2_hdw *hdw)
+static int pvr2_hdw_cmd_power_ctrl(struct pvr2_hdw *hdw, int onoff)
 {
 	int status;
 	LOCK_TAKE(hdw->ctl_lock); do {
-		pvr2_trace(PVR2_TRACE_INIT,"Requesting powerup");
-		hdw->cmd_buffer[0] = FX2CMD_POWER_ON;
-		status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0);
+		if (onoff) {
+			pvr2_trace(PVR2_TRACE_INIT, "Requesting powerup");
+			hdw->cmd_buffer[0] = FX2CMD_POWER_ON;
+		} else {
+			pvr2_trace(PVR2_TRACE_INIT, "Requesting powerdown");
+			hdw->cmd_buffer[0] = FX2CMD_POWER_OFF;
+		}
+		status = pvr2_send_request(hdw, hdw->cmd_buffer, 1, NULL, 0);
 	} while (0); LOCK_GIVE(hdw->ctl_lock);
 	return status;
 }
 
+int pvr2_hdw_cmd_powerup(struct pvr2_hdw *hdw)
+{
+	return pvr2_hdw_cmd_power_ctrl(hdw, 1);
+}
+
+int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *hdw)
+{
+	return pvr2_hdw_cmd_power_ctrl(hdw, 0);
+}
+
 
 int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw)
 {
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 2919a1d9ed0f..57e1ff491497 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -255,6 +255,9 @@ int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *);
 /* Execute simple reset command */
 int pvr2_hdw_cmd_powerup(struct pvr2_hdw *);
 
+/* suspend */
+int pvr2_hdw_cmd_powerdown(struct pvr2_hdw *);
+
 /* Order decoder to reset */
 int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *);