X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=net%2Fnfc%2Fllcp%2Fllcp.c;h=d649fbf39d580bcbd2936de0e2c81ff29acb56d0;hb=fe235b58d517d623bf6d40c77afca1b0ee6fc85d;hp=90ef4a17681901a93dfe0ae8a12b8dd1d6068f43;hpb=944f8a1a6f5ff8b503f3544811d0aa4ac27dd2aa;p=firefly-linux-kernel-4.4.55.git

diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 90ef4a176819..d649fbf39d58 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -1156,8 +1156,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
 
 	INIT_WORK(&local->timeout_work, nfc_llcp_timeout_work);
 
-	local->sockets.lock = __RW_LOCK_UNLOCKED(local->sockets.lock);
-	local->connecting_sockets.lock = __RW_LOCK_UNLOCKED(local->connecting_sockets.lock);
+	rwlock_init(&local->sockets.lock);
+	rwlock_init(&local->connecting_sockets.lock);
 
 	nfc_llcp_build_gb(local);