Upstream commit 58f09e00ae09 was applied to the wrong function when cherry-picked for 2.6.32.61.
Signed-off-by: Ben Hutchings <[email protected]> --- drivers/block/cciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b2225ab..d4d165a 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1011,6 +1011,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, @@ -1051,7 +1052,6 @@ static int cciss_ioctl32_big_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, -- Ben Hutchings Experience is directly proportional to the value of equipment destroyed. - Carolyn Scheppner
signature.asc
Description: This is a digitally signed message part
