[2.6 patch] drivers/char/mwave/tp3780i.c: remove dead code

[Adrian Bunk]

This patch removes some dead code found by the Coverity checker.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

---

 drivers/char/mwave/tp3780i.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- linux-2.6.12-rc2-mm2-full/drivers/char/mwave/tp3780i.c.old  2005-04-09 
21:41:37.000000000 +0200
+++ linux-2.6.12-rc2-mm2-full/drivers/char/mwave/tp3780i.c      2005-04-09 
21:42:32.000000000 +0200
@@ -283,13 +283,13 @@
 
 
 
 int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 {
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
-       BOOLEAN bDSPPoweredUp = FALSE, bDSPEnabled = FALSE, bInterruptAllocated 
= FALSE;
+       BOOLEAN bDSPPoweredUp = FALSE, bInterruptAllocated = FALSE;
 
        PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_EnableDSP entry pBDData 
%p\n", pBDData);
 
        if (pBDData->bDSPEnabled) {
                PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: 
DSP already enabled!\n");
                goto exit_cleanup;
@@ -388,28 +388,24 @@
                bDSPPoweredUp = TRUE;
        }
 
        if (dsp3780I_EnableDSP(pSettings, s_ausThinkpadIrqToField, 
s_ausThinkpadDmaToField)) {
                PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: 
dsp7880I_EnableDSP() failed\n");
                goto exit_cleanup;
-       } else {
-               bDSPEnabled = TRUE;
        }
 
        EnableSRAM(pBDData);
 
        pBDData->bDSPEnabled = TRUE;
 
        PRINTK_1(TRACE_TP3780I, "tp3780i::tp3780I_EnableDSP exit\n");
 
        return 0;
 
 exit_cleanup:
        PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Cleaning up\n");
-       if (bDSPEnabled)
-               dsp3780I_DisableDSP(pSettings);
        if (bDSPPoweredUp)
                smapi_set_DSP_power_state(FALSE);
        if (bInterruptAllocated) {
                free_irq(pSettings->usDspIrq, NULL);
                pSettings->bInterruptClaimed = FALSE;
        }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/