aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-25 09:40:07 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-06 13:45:20 -0400
commit7ed67f15f4d659b1fd2ad82fdea4746f4a1cdf94 (patch)
tree6a62d19ba0d24bb945c692086045a9b48b07d552 /drivers/media/dvb
parentdb3ca1d5f118ef5ab5717068ee02c1e44e011e64 (diff)
[media] mantis: fix compiler warnings
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/mantis/hopper_cards.c4
-rw-r--r--drivers/media/dvb/mantis/mantis_cards.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/dvb/mantis/hopper_cards.c
index 1402062f2c89..8bbeebc4ffb1 100644
--- a/drivers/media/dvb/mantis/hopper_cards.c
+++ b/drivers/media/dvb/mantis/hopper_cards.c
@@ -65,7 +65,7 @@ static int devs;
65 65
66static irqreturn_t hopper_irq_handler(int irq, void *dev_id) 66static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
67{ 67{
68 u32 stat = 0, mask = 0, lstat = 0, mstat = 0; 68 u32 stat = 0, mask = 0, lstat = 0;
69 u32 rst_stat = 0, rst_mask = 0; 69 u32 rst_stat = 0, rst_mask = 0;
70 70
71 struct mantis_pci *mantis; 71 struct mantis_pci *mantis;
@@ -80,7 +80,7 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
80 80
81 stat = mmread(MANTIS_INT_STAT); 81 stat = mmread(MANTIS_INT_STAT);
82 mask = mmread(MANTIS_INT_MASK); 82 mask = mmread(MANTIS_INT_MASK);
83 mstat = lstat = stat & ~MANTIS_INT_RISCSTAT; 83 lstat = stat & ~MANTIS_INT_RISCSTAT;
84 if (!(stat & mask)) 84 if (!(stat & mask))
85 return IRQ_NONE; 85 return IRQ_NONE;
86 86
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
index 05cbb9d95727..e6c8368782e0 100644
--- a/drivers/media/dvb/mantis/mantis_cards.c
+++ b/drivers/media/dvb/mantis/mantis_cards.c
@@ -73,7 +73,7 @@ static char *label[10] = {
73 73
74static irqreturn_t mantis_irq_handler(int irq, void *dev_id) 74static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
75{ 75{
76 u32 stat = 0, mask = 0, lstat = 0, mstat = 0; 76 u32 stat = 0, mask = 0, lstat = 0;
77 u32 rst_stat = 0, rst_mask = 0; 77 u32 rst_stat = 0, rst_mask = 0;
78 78
79 struct mantis_pci *mantis; 79 struct mantis_pci *mantis;
@@ -88,7 +88,7 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
88 88
89 stat = mmread(MANTIS_INT_STAT); 89 stat = mmread(MANTIS_INT_STAT);
90 mask = mmread(MANTIS_INT_MASK); 90 mask = mmread(MANTIS_INT_MASK);
91 mstat = lstat = stat & ~MANTIS_INT_RISCSTAT; 91 lstat = stat & ~MANTIS_INT_RISCSTAT;
92 if (!(stat & mask)) 92 if (!(stat & mask))
93 return IRQ_NONE; 93 return IRQ_NONE;
94 94