John, looks like you didn't merge the last patch "[PATCH 33/33] iwlwifi: remove the input device from rfkill_mngr" from me but merged an earlier patch from Adel directly. Tomas' this patch fixes the iwl-rfkill.c part, but we should also remove the input layer for 3945. Do you want me to submit another patch on top of the current tip or you can handle it yourself. http://marc.info/?l=linux-wireless&m=121481826531792&w=2 Thanks, -yi > -----Original Message----- > From: Winkler, Tomas > Sent: 2008年7月1日 15:45 > To: linville@xxxxxxxxxxxxx; johannes@xxxxxxxxxxxxxxxx; Zhu, Yi > Cc: linux-wireless@xxxxxxxxxxxxxxx; Winkler, Tomas > Subject: [PATCH 1/1] iwlwifi: fix error path of iwl_rfkill_init > > This patch cleans rfkill error path. The problem was result of removing > the input device > > Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c > b/drivers/net/wireless/iwlwifi/iwl-rfkill.c > index aa9f31e..eebaf43 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c > +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c > @@ -101,17 +101,13 @@ int iwl_rfkill_init(struct iwl_priv *priv) > ret = rfkill_register(priv->rfkill_mngr.rfkill); > if (ret) { > IWL_ERROR("Unable to register rfkill: %d\n", ret); > - goto unregister_rfkill; > + goto free_rfkill; > } > > IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n"); > return ret; > > -unregister_rfkill: > - rfkill_unregister(priv->rfkill_mngr.rfkill); > - priv->rfkill_mngr.rfkill = NULL; > - > -freed_rfkill: > +free_rfkill: > if (priv->rfkill_mngr.rfkill != NULL) > rfkill_free(priv->rfkill_mngr.rfkill); > priv->rfkill_mngr.rfkill = NULL; > -- > 1.5.4.1 -- 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
