| Message ID | 20230713030358.12379-1-machel@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1e4134610d93271535ecf900a676e1f094e9944c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [net,v1] net:wireless:Fix an NULL vs IS_ERR() bug for debugfs_create_dir() | expand |
correct subject prefix is "wifi: ath9k: " On 7/12/2023 8:03 PM, Wang Ming wrote: > The debugfs_create_dir() function returns error pointers, > it never returns NULL. Most incorrect error checks were fixed, > but the one in ath9k_htc_init_debug() was forgotten. > > Fix the remaining error check. > > Signed-off-by: Wang Ming <machel@vivo.com> > > Fixes: e5facc75fa91 ("ath9k_htc: Cleanup HTC debugfs") > --- > drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c > index b3ed65e5c4da..c55aab01fff5 100644 > --- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c > +++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c > @@ -491,7 +491,7 @@ int ath9k_htc_init_debug(struct ath_hw *ah) > > priv->debug.debugfs_phy = debugfs_create_dir(KBUILD_MODNAME, > priv->hw->wiphy->debugfsdir); > - if (!priv->debug.debugfs_phy) > + if (IS_ERR(priv->debug.debugfs_phy)) > return -ENOMEM; > > ath9k_cmn_spectral_init_debug(&priv->spec_priv, priv->debug.debugfs_phy);
Wang Ming <machel@vivo.com> writes: > The debugfs_create_dir() function returns error pointers, > it never returns NULL. Most incorrect error checks were fixed, > but the one in ath9k_htc_init_debug() was forgotten. > > Fix the remaining error check. > > Signed-off-by: Wang Ming <machel@vivo.com> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Wang Ming <machel@vivo.com> wrote: > The debugfs_create_dir() function returns error pointers, > it never returns NULL. Most incorrect error checks were fixed, > but the one in ath9k_htc_init_debug() was forgotten. > > Fix the remaining error check. > > Fixes: e5facc75fa91 ("ath9k_htc: Cleanup HTC debugfs") > Signed-off-by: Wang Ming <machel@vivo.com> > Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 1e4134610d93 wifi: ath9k: use IS_ERR() with debugfs_create_dir()
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c index b3ed65e5c4da..c55aab01fff5 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c @@ -491,7 +491,7 @@ int ath9k_htc_init_debug(struct ath_hw *ah) priv->debug.debugfs_phy = debugfs_create_dir(KBUILD_MODNAME, priv->hw->wiphy->debugfsdir); - if (!priv->debug.debugfs_phy) + if (IS_ERR(priv->debug.debugfs_phy)) return -ENOMEM; ath9k_cmn_spectral_init_debug(&priv->spec_priv, priv->debug.debugfs_phy);
The debugfs_create_dir() function returns error pointers, it never returns NULL. Most incorrect error checks were fixed, but the one in ath9k_htc_init_debug() was forgotten. Fix the remaining error check. Signed-off-by: Wang Ming <machel@vivo.com> Fixes: e5facc75fa91 ("ath9k_htc: Cleanup HTC debugfs") --- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)