Commit c7630a4b authored by Samuel Ortiz's avatar Samuel Ortiz Committed by David S. Miller
Browse files

[IrDA]: irda lockdep annotation 



Rmmoding irda triggers a lockdep false positive.

Reported-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarSamuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c81cd75

net/irda/irqueue.c

+8 −1
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ EXPORT_SYMBOL(hashbin_new); 
 *    for deallocating this structure if it's complex. If not the user can

 *    just supply kfree, which should take care of the job.

 */

#ifdef CONFIG_LOCKDEP

static int hashbin_lock_depth = 0;

#endif

int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func)

{

	irda_queue_t* queue;
@@ -395,7 +398,8 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func) 


	/* Synchronize */

	if ( hashbin->hb_type & HB_LOCK ) {

		spin_lock_irqsave(&hashbin->hb_spinlock, flags);

		spin_lock_irqsave_nested(&hashbin->hb_spinlock, flags,

					 hashbin_lock_depth++);

	}



	/*
@@ -419,6 +423,9 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func) 
	/* Release lock */

	if ( hashbin->hb_type & HB_LOCK) {

		spin_unlock_irqrestore(&hashbin->hb_spinlock, flags);

#ifdef CONFIG_LOCKDEP

		hashbin_lock_depth--;

#endif

	}



	/*