On Tue, 2011-04-19 at 14:00 +0200, Stanislaw Gruszka wrote: > On Mon, Apr 18, 2011 at 09:44:09AM -0700, Wey-Yi Guy wrote: > > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > @@ -394,7 +394,9 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, > > return -EINVAL; > > } > > > > - BUG_ON(addr & ~DMA_BIT_MASK(36)); > > + if (WARN_ON(addr & ~DMA_BIT_MASK(36))) > > + return -EINVAL; > Seems useless. Better than the BUG_ON, mostly to catch programmer errors though I guess. > > @@ -169,10 +171,12 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) > > int cmd_idx; > > int ret; > > > > - lockdep_assert_held(&priv->mutex); > I think better keep it. Oh, that must be a merge error, I don't remember doing that. johannes -------------------------------------------------------------------------------------- Intel GmbH Dornacher Strasse 1 85622 Feldkirchen/Muenchen, Deutschland Sitz der Gesellschaft: Feldkirchen bei Muenchen Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer Registergericht: Muenchen HRB 47456 Ust.-IdNr./VAT Registration No.: DE129385895 Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052 ÿô.nÇ·®+%˱é¥wÿº{.nÇ·¥{±ÿ«zW¬³ø¡Ü}©²ÆzÚj:+v¨þø®w¥þàÞ¨è&¢)ß«a¶Úÿûz¹ÞúÝjÿwèf