diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-11-24 14:50:07 +0000 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-11-24 14:50:07 +0000 |
commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d (patch) | |
tree | d72f980f64b88ea4e976215a503fcb038e02f981 /drivers/firewire/core-cdev.c | |
parent | 2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094 (diff) | |
parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts:
drivers/of/address.c
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r-- | drivers/firewire/core-cdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 5d997a33907e..2a3973a7c441 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1637,8 +1637,7 @@ static int dispatch_ioctl(struct client *client, _IOC_SIZE(cmd) > sizeof(buffer)) return -ENOTTY; - if (_IOC_DIR(cmd) == _IOC_READ) - memset(&buffer, 0, _IOC_SIZE(cmd)); + memset(&buffer, 0, sizeof(buffer)); if (_IOC_DIR(cmd) & _IOC_WRITE) if (copy_from_user(&buffer, arg, _IOC_SIZE(cmd))) |