Commit 0f3edb4c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix init_i82365 sysfs ordering oops

From: Russell King <rmk@arm.linux.org.uk>

This oops has been caused by the need to register the class before
registering any objects against it.  Unfortunately, the class needs
to be registered asynchronously in a separate thread to avoid driver
model deadlock with yenta with cardbus cards inserted or standard
PCMCIA cards not being detected correctly due to a race.

I think the only real solution is to remove the class_device_create_file
calls from all socket drivers.  This is just a simple commenting out of
the calls, and should be suitable for the remainder of the -test kernels.

Due to the number of cases that we're encountering with PCMCIA, I'm
beginning to wonder if the driver model could be fixed to be more kind
to PCMCIA by avoiding some of these ordering dependencies.  None of this
would be a problem if the driver model would allow PCI device drivers to
register PCI devices while their probe or remove functions were executing.
parent 4e1c704a
...@@ -1211,6 +1211,7 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem) ...@@ -1211,6 +1211,7 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem)
return 0; return 0;
} /* i365_set_mem_map */ } /* i365_set_mem_map */
#if 0 /* driver model ordering issue */
/*====================================================================== /*======================================================================
Routines for accessing socket information and register dumps via Routines for accessing socket information and register dumps via
...@@ -1250,6 +1251,7 @@ static ssize_t show_exca(struct class_device *class_dev, char *buf) ...@@ -1250,6 +1251,7 @@ static ssize_t show_exca(struct class_device *class_dev, char *buf)
static CLASS_DEVICE_ATTR(exca, S_IRUGO, show_exca, NULL); static CLASS_DEVICE_ATTR(exca, S_IRUGO, show_exca, NULL);
static CLASS_DEVICE_ATTR(info, S_IRUGO, show_info, NULL); static CLASS_DEVICE_ATTR(info, S_IRUGO, show_info, NULL);
#endif
/*====================================================================*/ /*====================================================================*/
...@@ -1414,10 +1416,12 @@ static int __init init_i82365(void) ...@@ -1414,10 +1416,12 @@ static int __init init_i82365(void)
pcmcia_unregister_socket(&socket[i].socket); pcmcia_unregister_socket(&socket[i].socket);
break; break;
} }
#if 0 /* driver model ordering issue */
class_device_create_file(&socket[i].socket.dev, class_device_create_file(&socket[i].socket.dev,
&class_device_attr_info); &class_device_attr_info);
class_device_create_file(&socket[i].socket.dev, class_device_create_file(&socket[i].socket.dev,
&class_device_attr_exca); &class_device_attr_exca);
#endif
} }
/* Finally, schedule a polling interrupt */ /* Finally, schedule a polling interrupt */
......
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