From 051b7bc03a81b946c72aba55b62b6db9b6e5b168 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 7 Mar 2009 00:08:17 -0300
Subject: [PATCH] --- yaml --- r: 138274 b: refs/heads/master c:
 40f07111be99b71c1e8d40c13cdc38445add787f h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c    | 14 ++++++++++++++
 .../media/video/pvrusb2/pvrusb2-i2c-track.c        |  8 --------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f89659350856..1b8d777d6328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8f5b9ba82482cab344c2d54c2c487b607e34864
+refs/heads/master: 40f07111be99b71c1e8d40c13cdc38445add787f
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 4e50e7bc5745..d619e807a339 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -4816,7 +4816,21 @@ int pvr2_hdw_gpio_chg_out(struct pvr2_hdw *hdw,u32 msk,u32 val)
 
 void pvr2_hdw_status_poll(struct pvr2_hdw *hdw)
 {
+	struct v4l2_tuner *vtp = &hdw->tuner_signal_info;
+	memset(vtp, 0, sizeof(*vtp));
 	pvr2_i2c_core_status_poll(hdw);
+	/* Note: There apparently is no replacement for VIDIOC_CROPCAP
+	   using v4l2-subdev - therefore we can't support that AT ALL right
+	   now.  (Of course, no sub-drivers seem to implement it either.
+	   But now it's a a chicken and egg problem...) */
+	v4l2_device_call_all(&hdw->v4l2_dev, 0, tuner, g_tuner,
+			     &hdw->tuner_signal_info);
+	pvr2_trace(PVR2_TRACE_CHIPS, "client status poll"
+		   " type=%u strength=%u audio=0x%x cap=0x%x"
+		   " low=%u hi=%u",
+		   vtp->type,
+		   vtp->signal, vtp->rxsubchans, vtp->capability,
+		   vtp->rangelow, vtp->rangehigh);
 }
 
 
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
index 3387897ed897..7ca1b660cbe4 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
@@ -112,20 +112,12 @@ void pvr2_i2c_core_status_poll(struct pvr2_hdw *hdw)
 {
 	struct pvr2_i2c_client *cp;
 	mutex_lock(&hdw->i2c_list_lock); do {
-		struct v4l2_tuner *vtp = &hdw->tuner_signal_info;
-		memset(vtp,0,sizeof(*vtp));
 		list_for_each_entry(cp, &hdw->i2c_clients, list) {
 			if (!cp->detected_flag) continue;
 			if (!cp->status_poll) continue;
 			cp->status_poll(cp);
 		}
 		hdw->tuner_signal_stale = 0;
-		pvr2_trace(PVR2_TRACE_CHIPS,"i2c status poll"
-			   " type=%u strength=%u audio=0x%x cap=0x%x"
-			   " low=%u hi=%u",
-			   vtp->type,
-			   vtp->signal,vtp->rxsubchans,vtp->capability,
-			   vtp->rangelow,vtp->rangehigh);
 	} while (0); mutex_unlock(&hdw->i2c_list_lock);
 }