diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
| commit | efd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch) | |
| tree | eec56da5fbc796bac7c67f1990a18f5e0a304059 /drivers/block/paride/pg.c | |
| parent | f8a15af093b19b86d56933c8757cee298d0f32a8 (diff) | |
| parent | 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (diff) | |
| download | lwn-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.tar.gz lwn-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'drivers/block/paride/pg.c')
| -rw-r--r-- | drivers/block/paride/pg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 6b9a2000d56a..a79fb4f7ff62 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -630,6 +630,7 @@ static ssize_t pg_read(struct file *filp, char __user *buf, size_t count, loff_t if (dev->status & 0x10) return -ETIME; + memset(&hdr, 0, sizeof(hdr)); hdr.magic = PG_MAGIC; hdr.dlen = dev->dlen; copy = 0; |