diff --git a/[refs] b/[refs]
index dbdf14771faf..9d1a001c21f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35ec126507529ce407136c6b9e36747d89891f9
+refs/heads/master: 7d18f114897ff4358419b14d551e704a4299a440
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 00b14e2c50ed..67b4f3e3d4a5 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -138,7 +138,7 @@ static int poll_one_napi(struct netpoll_info *npinfo,
 	set_bit(NAPI_STATE_NPSVC, &napi->state);
 
 	work = napi->poll(napi, budget);
-	trace_napi_poll(napi->dev);
+	trace_napi_poll(napi);
 
 	clear_bit(NAPI_STATE_NPSVC, &napi->state);
 	atomic_dec(&trapped);