diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:27:03 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:27:03 +0400 |
| commit | d7173493683853047d6efc8d4454c70469a7b033 (patch) | |
| tree | 8e6dac16d3104494b5cc2f33756c582ecdc3b753 /drivers/block/cciss.c | |
| parent | 80d26236c7c583ea2f43b68008ab7e067102c62c (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-d7173493683853047d6efc8d4454c70469a7b033.tar.xz | |
Merge 3.12-rc3 into char-misc-next
We need/want the mei fixes in here so we can apply other updates that
are depending on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index d2d95ff5353b..edfa2515bc86 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1189,6 +1189,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode, int err; u32 cp; + memset(&arg64, 0, sizeof(arg64)); err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, |