Commit 15b273f1 authored by Simon Kelley's avatar Simon Kelley Committed by Jeff Garzik

[PATCH] [Bug 2948] New: Atmel wireless driver Oopses

parent 9b61ffcf
......@@ -348,9 +348,19 @@ static struct {
};
/* This is strictly temporary, until PCMCIA devices get integrated into the device model. */
static struct device atmel_device = {
static struct device *atmel_device(void)
{
static char *kobj_name = "atmel_cs";
static struct device dev = {
.bus_id = "pcmcia",
};
};
dev.kobj.k_name = kmalloc(strlen(kobj_name)+1, GFP_KERNEL);
strcpy(dev.kobj.k_name, kobj_name);
kobject_init(&dev.kobj);
return &dev;
}
static void atmel_config(dev_link_t *link)
{
......@@ -542,7 +552,7 @@ static void atmel_config(dev_link_t *link)
init_atmel_card(link->irq.AssignedIRQ,
link->io.BasePort1,
card_index == -1 ? NULL : card_table[card_index].firmware,
&atmel_device,
atmel_device(),
card_present,
link);
if (!((local_info_t*)link->priv)->eth_dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment