Messages in this thread | | | Subject | Re: [PATCH 4/7] drivers/net/wireless/ipw2100.c: Release mutex in error handling code | From | Zhu Yi <> | Date | Mon, 04 Aug 2008 10:41:18 +0800 |
| |
On Mon, 2008-07-21 at 09:58 +0200, Julia Lawall wrote: > From: Julia Lawall <julia@diku.dk> > > The mutex is released on a successful return, so it would seem that it > should be released on an error return as well.
Acked-by: Zhu Yi <yi.zhu@intel.com>
Thanks, -yi
> The semantic patch finds this problem is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // <smpl> > @@ > expression l; > @@ > > mutex_lock(l); > ... when != mutex_unlock(l) > when any > when strict > ( > if (...) { ... when != mutex_unlock(l) > + mutex_unlock(l); > return ...; > } > | > mutex_unlock(l); > ) > // </smpl> > > Signed-off-by: Julia Lawall <julia@diku.dk> > > --- > diff -u -p a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c > --- a/drivers/net/wireless/ipw2100.c > +++ b/drivers/net/wireless/ipw2100.c > @@ -6442,6 +6442,7 @@ static int ipw2100_resume(struct pci_dev > if (err) { > printk(KERN_ERR "%s: pci_enable_device failed on resume\n", > dev->name); > + mutex_unlock(&priv->action_mutex); > return err; > } > pci_restore_state(pci_dev); > @@ -7146,7 +7147,7 @@ static int ipw2100_wx_get_rate(struct ne > err = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE, &val, &len); > if (err) { > IPW_DEBUG_WX("failed querying ordinals.\n"); > - return err; > + goto done; > } > > switch (val & TX_RATE_MASK) {
| |