summaryrefslogtreecommitdiff
path: root/package/b43/src/pcmcia.c
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-06-04 19:47:48 +0000
committerPeter Denison <openwrt@marshadder.org>2008-06-04 19:47:48 +0000
commitb2a1f5e79bd22acba7d88089904cfa78adc5b46f (patch)
treeaebbf69ea17a65b63b840390ead0e106ec2f5fc6 /package/b43/src/pcmcia.c
parente8620fa5aa1e1cc71f909f938c01207f22aa1b68 (diff)
downloadmtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.zip
mtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.tar.gz
mtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.tar.bz2
Update b43 from compat-wireless-2008-05-26 codebase
SVN-Revision: 11358
Diffstat (limited to 'package/b43/src/pcmcia.c')
-rw-r--r--package/b43/src/pcmcia.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/package/b43/src/pcmcia.c b/package/b43/src/pcmcia.c
index b79a6bd..b8aa163 100644
--- a/package/b43/src/pcmcia.c
+++ b/package/b43/src/pcmcia.c
@@ -43,14 +43,16 @@ MODULE_DEVICE_TABLE(pcmcia, b43_pcmcia_tbl);
#ifdef CONFIG_PM
static int b43_pcmcia_suspend(struct pcmcia_device *dev)
{
- //TODO
- return 0;
+ struct ssb_bus *ssb = dev->priv;
+
+ return ssb_bus_suspend(ssb);
}
static int b43_pcmcia_resume(struct pcmcia_device *dev)
{
- //TODO
- return 0;
+ struct ssb_bus *ssb = dev->priv;
+
+ return ssb_bus_resume(ssb);
}
#else /* CONFIG_PM */
# define b43_pcmcia_suspend NULL
@@ -91,6 +93,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
dev->conf.ConfigBase = parse.config.base;
dev->conf.Present = parse.config.rmask[0];
+ dev->conf.Attributes = CONF_ENABLE_IRQ;
+ dev->conf.IntType = INT_MEMORY_AND_IO;
dev->io.BasePort2 = 0;
dev->io.NumPorts2 = 0;
@@ -112,8 +116,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
if (res != CS_SUCCESS)
goto err_disable;
- dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
- dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID;
+ dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
+ dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
dev->irq.Handler = NULL; /* The handler is registered later. */
dev->irq.Instance = NULL;
res = pcmcia_request_irq(dev, &dev->irq);