[media] drxk: Does not unlock mutex if sanity check failed in scu_command()

[pandora-kernel.git] / drivers / media / dvb / frontends / drxk_hard.c

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 5fa1927..a414b1f 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/version.h>
 #include <asm/div64.h>
 
 #include "dvb_frontend.h"
@@ -1521,8 +1520,10 @@ static int scu_command(struct drxk_state *state,
        dprintk(1, "\n");
 
        if ((cmd == 0) || ((parameterLen > 0) && (parameter == NULL)) ||
-           ((resultLen > 0) && (result == NULL)))
-               goto error;
+           ((resultLen > 0) && (result == NULL))) {
+               printk(KERN_ERR "drxk: Error %d on %s\n", status, __func__);
+               return status;
+       }
 
        mutex_lock(&state->mutex);
 
@@ -6317,15 +6318,12 @@ static int drxk_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_t
        switch (p->delivery_system) {
        case SYS_DVBC_ANNEX_A:
        case SYS_DVBC_ANNEX_C:
+       case SYS_DVBT:
                sets->min_delay_ms = 3000;
                sets->max_drift = 0;
                sets->step_size = 0;
                return 0;
        default:
-               /*
-                * For DVB-T, let it use the default DVB core way, that is:
-                *      fepriv->step_size = fe->ops.info.frequency_stepsize * 2
-                */
                return -EINVAL;
        }
 }