On Tue, Mar 17, 2009 at 10:56:35PM +0100, Ivo van Doorn wrote: > On Tuesday 17 March 2009, John W. Linville wrote: > > On Mon, Mar 16, 2009 at 08:24:27PM +0100, Ivo van Doorn wrote: > > > At rmmod stage, the code path is the following one : > > > > > > rt2x00lib_remove_dev > > > -> rt2x00lib_uninitialize() > > > -> rt2x00rfkill_unregister() > > > -> rfkill_unregister() > > > -> rt2x00rfkill_free() > > > -> rfkill_free() > > > > > > The problem is that rfkill_free should not be called after rfkill_register > > > otherwise put_device(&rfkill->dev) will be called 2 times. This patch > > > fixes this by only calling rt2x00rfkill_free() when rt2x00rfkill_register() > > > hasn't been called or has failed. > > > > > > Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> > > > Tested-by: Arnaud Patard <apatard@xxxxxxxxxxxx> > > > Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> > > > > > > --- > > > John, this patch is for 2.6.29 and only 2.6.29 since rfkill support itself > > > was removed from later versions (replaced by input_polldev). > > > The patch is quite big to be merged in a late state of the release cycle, > > > but since the SLAB corruption is a serious problem, I hope this can get in regardless. > > > > Could you send me a version of this that applies on top of > > wireless-testing? > > Actually no, the code isn't present at all in wireless-testing. > As I said, after 2.6.29 the entire rfkill structure is removed from rt2x00 > and replaced by input_polldev. I guess I misunderstood. So just to be clear, no remnant or shadow of this patch should live-on to 2.6.30? It's just that the merge conflicts created by this patch were awful. With 2.6.29's release presumably close, maybe this is a candidate for the stable tree? John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html