UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

b43: pcmcia-host initialization bugfixes 

Fix the initialization for PCMCIA devices.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2007-11-06 16:36:41 +01:00 committed by Jeff Garzik
parent a2a1c3eb40
commit ce2d90591f
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/net/wireless/b43/pcmcia.c
View File

@ -65,12 +65,12 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
tuple_t tuple; tuple_t tuple;
cisparse_t parse; cisparse_t parse;
int err = -ENOMEM; int err = -ENOMEM;
int res; int res = 0;
unsigned char buf[64]; unsigned char buf[64];
ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
if (!ssb) if (!ssb)
goto out; goto out_error;
err = -ENODEV; err = -ENODEV;
tuple.DesiredTuple = CISTPL_CONFIG; tuple.DesiredTuple = CISTPL_CONFIG;
@ -96,10 +96,12 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
dev->io.NumPorts2 = 0; dev->io.NumPorts2 = 0;
dev->io.Attributes2 = 0; dev->io.Attributes2 = 0;
win.Attributes = WIN_MEMORY_TYPE_CM | WIN_ENABLE | WIN_USE_WAIT; win.Attributes = WIN_ADDR_SPACE_MEM | WIN_MEMORY_TYPE_CM |
WIN_ENABLE | WIN_DATA_WIDTH_16 |
WIN_USE_WAIT;
win.Base = 0; win.Base = 0;
win.Size = SSB_CORE_SIZE; win.Size = SSB_CORE_SIZE;
win.AccessSpeed = 1000; win.AccessSpeed = 250;
res = pcmcia_request_window(&dev, &win, &dev->win); res = pcmcia_request_window(&dev, &win, &dev->win);
if (res != CS_SUCCESS) if (res != CS_SUCCESS)
goto err_kfree_ssb; goto err_kfree_ssb;
@ -108,21 +110,26 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
mem.Page = 0; mem.Page = 0;
res = pcmcia_map_mem_page(dev->win, &mem); res = pcmcia_map_mem_page(dev->win, &mem);
if (res != CS_SUCCESS) if (res != CS_SUCCESS)
goto err_kfree_ssb; goto err_disable;
res = pcmcia_request_configuration(dev, &dev->conf); res = pcmcia_request_configuration(dev, &dev->conf);
if (res != CS_SUCCESS) if (res != CS_SUCCESS)
goto err_disable; goto err_disable;
err = ssb_bus_pcmciabus_register(ssb, dev, win.Base); err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);
if (err)
goto err_disable;
dev->priv = ssb; dev->priv = ssb;
out: return 0;
return err;
err_disable: err_disable:
pcmcia_disable_device(dev); pcmcia_disable_device(dev);
err_kfree_ssb: err_kfree_ssb:
kfree(ssb); kfree(ssb);
out_error:
printk(KERN_ERR "b43-pcmcia: Initialization failed (%d, %d)\n",
res, err);
return err; return err;
} }
@ -131,22 +138,21 @@ static void __devexit b43_pcmcia_remove(struct pcmcia_device *dev)
struct ssb_bus *ssb = dev->priv; struct ssb_bus *ssb = dev->priv;
ssb_bus_unregister(ssb); ssb_bus_unregister(ssb);
pcmcia_release_window(dev->win);
pcmcia_disable_device(dev); pcmcia_disable_device(dev);
kfree(ssb); kfree(ssb);
dev->priv = NULL; dev->priv = NULL;
} }
static struct pcmcia_driver b43_pcmcia_driver = { static struct pcmcia_driver b43_pcmcia_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.drv = { .drv = {
.name = "b43-pcmcia", .name = "b43-pcmcia",
}, },
.id_table = b43_pcmcia_tbl, .id_table = b43_pcmcia_tbl,
.probe = b43_pcmcia_probe, .probe = b43_pcmcia_probe,
.remove = b43_pcmcia_remove, .remove = __devexit_p(b43_pcmcia_remove),
.suspend = b43_pcmcia_suspend, .suspend = b43_pcmcia_suspend,
.resume = b43_pcmcia_resume, .resume = b43_pcmcia_resume,
}; };
int b43_pcmcia_init(void) int b43_pcmcia_init(void)