diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
| commit | 68556ca1e03d6a35be3b315eba58df2f8176e3a0 (patch) | |
| tree | 36a390d29a0d03a59a90c0f223b0d98a80f0f6c3 /drivers/block/paride/pg.c | |
| parent | 0604ca48f1689ad06144b81f5c08f297b6edd831 (diff) | |
| parent | 8ab30691826fc05efa47c4ffba19b80496bb3a2c (diff) | |
Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3
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 | |||
| 630 | if (dev->status & 0x10) | 630 | if (dev->status & 0x10) |
| 631 | return -ETIME; | 631 | return -ETIME; |
| 632 | 632 | ||
| 633 | memset(&hdr, 0, sizeof(hdr)); | ||
| 633 | hdr.magic = PG_MAGIC; | 634 | hdr.magic = PG_MAGIC; |
| 634 | hdr.dlen = dev->dlen; | 635 | hdr.dlen = dev->dlen; |
| 635 | copy = 0; | 636 | copy = 0; |