Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226419
b: refs/heads/master
c: ebce9a3
h: refs/heads/master
i:
  226417: 82aeeb7
  226415: 53f8f16
v: v3
  • Loading branch information
Igor M. Liplianin authored and Mauro Carvalho Chehab committed Dec 31, 2010
1 parent 94382a8 commit 7048915
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21d33014108671cc6b02feda088f32bf26ce532d
refs/heads/master: ebce9a3331f4dd1f39856dc4b79f539eb25f7f64
24 changes: 16 additions & 8 deletions trunk/drivers/media/video/cx23885/cimax2.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ static void netup_read_ci_status(struct work_struct *work)
DVB_CA_EN50221_POLL_CAM_READY;
else
state->status = 0;
};
}
}

/* CI irq handler */
Expand All @@ -377,16 +377,24 @@ int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status)
struct cx23885_tsport *port = NULL;
struct netup_ci_state *state = NULL;

if (pci_status & PCI_MSK_GPIO0)
port = &dev->ts1;
else if (pci_status & PCI_MSK_GPIO1)
port = &dev->ts2;
else /* who calls ? */
ci_dbg_print("%s:\n", __func__);

if (0 == (pci_status & (PCI_MSK_GPIO0 | PCI_MSK_GPIO1)))
return 0;

state = port->port_priv;
if (pci_status & PCI_MSK_GPIO0) {
port = &dev->ts1;
state = port->port_priv;
schedule_work(&state->work);
ci_dbg_print("%s: Wakeup CI0\n", __func__);
}

schedule_work(&state->work);
if (pci_status & PCI_MSK_GPIO1) {
port = &dev->ts2;
state = port->port_priv;
schedule_work(&state->work);
ci_dbg_print("%s: Wakeup CI1\n", __func__);
}

return 1;
}
Expand Down

0 comments on commit 7048915

Please sign in to comment.