[kernel/f15] Reapply rebased drivers-media-update.patch

[Josh Boyer]

commit 51e2b3d120a39de0077c45398f288cbf752078e9
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Apr 13 15:43:44 2012 -0400

    Reapply rebased drivers-media-update.patch

 drivers-media-update.patch |   42 +++---------------------------------------
 kernel.spec                |    7 +++++--
 2 files changed, 8 insertions(+), 41 deletions(-)
---
diff --git a/drivers-media-update.patch b/drivers-media-update.patch
index 5d5612b..f08a5d5 100644
--- a/drivers-media-update.patch
+++ b/drivers-media-update.patch
@@ -10439,51 +10439,15 @@ Index: linux-3.3.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c
 ===================================================================
 --- linux-3.3.x86_64.orig/drivers/media/dvb/dvb-core/dvb_frontend.c
 +++ linux-3.3.x86_64/drivers/media/dvb/dvb-core/dvb_frontend.c
-@@ -143,10 +143,12 @@ struct dvb_frontend_private {
- static void dvb_frontend_wakeup(struct dvb_frontend *fe);
- static int dtv_get_frontend(struct dvb_frontend *fe,
-			    struct dvb_frontend_parameters *p_out);
-+static int dtv_property_legacy_params_sync(struct dvb_frontend *fe,
-+					   struct dvb_frontend_parameters *p);
-
+@@ -148,7 +148,7 @@ static int dtv_property_legacy_params_sy
+ 
  static bool has_get_frontend(struct dvb_frontend *fe)
  {
 -	return fe->ops.get_frontend;
 +	return fe->ops.get_frontend != NULL;
  }
-
+ 
  /*
-@@ -655,6 +657,8 @@ restart:
-					dprintk("%s: Retune requested, FESTATE_RETUNE\n", __func__);
-					re_tune = true;
-					fepriv->state = FESTATE_TUNED;
-+				} else {
-+					re_tune = false;
-				}
-
-				if (fe->ops.tune)
-@@ -695,6 +699,7 @@ restart:
-					fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
-					fepriv->delay = HZ / 2;
-				}
-+				dtv_property_legacy_params_sync(fe, &fepriv->parameters_out);
-				fe->ops.read_status(fe, &s);
-				if (s != fepriv->status) {
-					dvb_frontend_add_event(fe, s); /* update event list */
-@@ -1831,6 +1836,13 @@ static int dtv_set_frontend(struct dvb_f
-		return -EINVAL;
-
-	/*
-+	 * Initialize output parameters to match the values given by
-+	 * the user. FE_SET_FRONTEND triggers an initial frontend event
-+	 * with status = 0, which copies output parameters to userspace.
-+	 */
-+	dtv_property_legacy_params_sync(fe, &fepriv->parameters_out);
-+
-+	/*
-	 * Be sure that the bandwidth will be filled for all
-	 * non-satellite systems, as tuners need to know what
-	 * low pass/Nyquist half filter should be applied, in
 Index: linux-3.3.x86_64/drivers/media/common/tuners/xc5000.c
 ===================================================================
 --- linux-3.3.x86_64.orig/drivers/media/common/tuners/xc5000.c
diff --git a/kernel.spec b/kernel.spec
index 1e77192..d547502 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -1236,7 +1236,7 @@ ApplyPatch quite-apm.patch
 # Media (V4L/DVB/IR) updates/fixes/experimental drivers
 #  apply if non-empty
 ApplyPatch add-poll-requested-events.patch
-#ApplyOptionalPatch drivers-media-update.patch
+ApplyOptionalPatch drivers-media-update.patch
 
 # Patches headed upstream
 
@@ -1948,6 +1948,9 @@ fi
 # and build.
 
 %changelog
+* Fri Apr 13 2012 Josh Boyer <jwboyer at redhat.com>
+- Reapply rebased drivers-media-update.patch
+
 * Fri Apr 13 2012 Dave Jones <davej at redhat.com> 2.6.43.2-1
 - Linux 3.3.2