|
@@ -701,10 +701,12 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)
|
|
if (dev->has_remote == SAA7134_REMOTE_GPIO && dev->remote) {
|
|
if (dev->has_remote == SAA7134_REMOTE_GPIO && dev->remote) {
|
|
if (dev->remote->mask_keydown & 0x10000)
|
|
if (dev->remote->mask_keydown & 0x10000)
|
|
irq2_mask |= SAA7134_IRQ2_INTE_GPIO16_N;
|
|
irq2_mask |= SAA7134_IRQ2_INTE_GPIO16_N;
|
|
- else if (dev->remote->mask_keydown & 0x40000)
|
|
|
|
- irq2_mask |= SAA7134_IRQ2_INTE_GPIO18_P;
|
|
|
|
- else if (dev->remote->mask_keyup & 0x40000)
|
|
|
|
- irq2_mask |= SAA7134_IRQ2_INTE_GPIO18_N;
|
|
|
|
|
|
+ else { /* Allow enabling both IRQ edge triggers */
|
|
|
|
+ if (dev->remote->mask_keydown & 0x40000)
|
|
|
|
+ irq2_mask |= SAA7134_IRQ2_INTE_GPIO18_P;
|
|
|
|
+ if (dev->remote->mask_keyup & 0x40000)
|
|
|
|
+ irq2_mask |= SAA7134_IRQ2_INTE_GPIO18_N;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (dev->has_remote == SAA7134_REMOTE_I2C) {
|
|
if (dev->has_remote == SAA7134_REMOTE_I2C) {
|