Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / i4l / act2000 / act2000_isa.c

diff --git a/drivers/staging/i4l/act2000/act2000_isa.c b/drivers/staging/i4l/act2000/act2000_isa.c
index f0eb8441deed138fbf69e8d95d6294dd46250766..1d931519833c4020fd5461083bc7c80bea1373a0 100644 (file)
--- a/drivers/staging/i4l/act2000/act2000_isa.c
+++ b/drivers/staging/i4l/act2000/act2000_isa.c
@@ -134,9 +134,9 @@ act2000_isa_config_irq(act2000_card *card, short irq)
 {
        int old_irq;
 
-       if (card->flags & ACT2000_FLAGS_IVALID) {
+       if (card->flags & ACT2000_FLAGS_IVALID)
                free_irq(card->irq, card);
-       }
+
        card->flags &= ~ACT2000_FLAGS_IVALID;
        outb(ISA_COR_IRQOFF, ISA_PORT_COR);
        if (!irq)