lkml.org 
[lkml]   [2006]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/23] Fix budget-av compile failure
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Andrew de Quincey <adq_dvb@lidskialf.net>

    Currently I am doing lots of refactoring work in the dvb tree. This
    bugfix became necessary to fix 2.6.17 whilst I was in the middle of this
    work. Unfortunately after I tested the original code for the patch, I
    generated the diff against the wrong tree (I accidentally used a tree
    with part of the refactoring code in it). This resulted in the reported
    compile errors because that tree (a) was incomplete, and (b) used
    features which are simply not in the mainline kernel yet.

    Many apologies for the error and problems this has caused. :(

    Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/dvb/ttpci/budget-av.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c
    +++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
    @@ -58,6 +58,7 @@ struct budget_av {
    struct tasklet_struct ciintf_irq_tasklet;
    int slot_status;
    struct dvb_ca_en50221 ca;
    + u8 reinitialise_demod:1;
    };

    /* GPIO Connections:
    @@ -214,8 +215,9 @@ static int ciintf_slot_reset(struct dvb_
    while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
    msleep(100);

    - /* reinitialise the frontend */
    - dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
    + /* reinitialise the frontend if necessary */
    + if (budget_av->reinitialise_demod)
    + dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);

    if (timeout <= 0)
    {
    @@ -1064,12 +1066,10 @@ static void frontend_init(struct budget_
    fe = tda10021_attach(&philips_cu1216_config,
    &budget_av->budget.i2c_adap,
    read_pwm(budget_av));
    - if (fe) {
    - fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
    - }
    break;

    case SUBID_DVBC_KNC1_PLUS:
    + budget_av->reinitialise_demod = 1;
    fe = tda10021_attach(&philips_cu1216_config,
    &budget_av->budget.i2c_adap,
    read_pwm(budget_av));
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-08-04 07:49    [W:0.037 / U:0.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site