From 70489156757d0688c8bd7a8cb75f0f80b30150ab Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Fri, 31 Dec 2010 02:04:38 -0300 Subject: [PATCH] --- yaml --- r: 226419 b: refs/heads/master c: ebce9a3331f4dd1f39856dc4b79f539eb25f7f64 h: refs/heads/master i: 226417: 82aeeb75d1890945f635a0d42fa216114d13d5cc 226415: 53f8f16dac369b2713a5e11483856738e5551d32 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cimax2.c | 24 ++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7b772997ec3e..b8fba8cd4401 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21d33014108671cc6b02feda088f32bf26ce532d +refs/heads/master: ebce9a3331f4dd1f39856dc4b79f539eb25f7f64 diff --git a/trunk/drivers/media/video/cx23885/cimax2.c b/trunk/drivers/media/video/cx23885/cimax2.c index c95e7bc14745..209b971bd267 100644 --- a/trunk/drivers/media/video/cx23885/cimax2.c +++ b/trunk/drivers/media/video/cx23885/cimax2.c @@ -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 */ @@ -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; }