aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-20 20:43:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-20 20:43:14 -0700
commitfa24615f4ce27fc41f11348459b2e26655c7255a (patch)
tree8eb8f529d64f3fcc4bfe9f1f02bd2407810a8a7c
parent5556ea4df6426e2a11f459a633e26cb7466e0d1c (diff)
parent2ef82d24f445e82f80e235f44eb9d1bc933e3670 (diff)
downloadlinux-stericsson-fa24615f4ce27fc41f11348459b2e26655c7255a.tar.gz
Merge tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fix from Greg KH: "Here's a single hyper-v driver fix for a reported issue" * tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: Drivers: hv: hv_fcopy: fix a race condition for SMP guest
-rw-r--r--drivers/hv/hv_fcopy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c
index eaaa3d843b80..23b2ce294c4c 100644
--- a/drivers/hv/hv_fcopy.c
+++ b/drivers/hv/hv_fcopy.c
@@ -246,8 +246,8 @@ void hv_fcopy_onchannelcallback(void *context)
/*
* Send the information to the user-level daemon.
*/
- fcopy_send_data();
schedule_delayed_work(&fcopy_work, 5*HZ);
+ fcopy_send_data();
return;
}
icmsghdr->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE;