diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:37:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:37:29 -0400 |
| commit | 4efb686205d5065f4e488e20fc858446b8ad7bb7 (patch) | |
| tree | 34502cd2ba57fa1418d66cf93d10d43c40c3f6f4 /drivers/ide/mips/swarm.c | |
| parent | 0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4 (diff) | |
| parent | d0eb40628e29c2bb3b5f8242b1d2f50b1a88d9da (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cdrom: update ioctl documentation
ide: note that IDE generic may prevent other drivers from attaching
ide-tape: fix vendor strings
Swarm: Fix crash due to missing initialization
Diffstat (limited to 'drivers/ide/mips/swarm.c')
| -rw-r--r-- | drivers/ide/mips/swarm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c index badf79fc9e3a..39c9ee995857 100644 --- a/drivers/ide/mips/swarm.c +++ b/drivers/ide/mips/swarm.c | |||
| @@ -107,6 +107,7 @@ static int __devinit swarm_ide_probe(struct device *dev) | |||
| 107 | 107 | ||
| 108 | base = ioremap(offset, size); | 108 | base = ioremap(offset, size); |
| 109 | 109 | ||
| 110 | memset(&hw, 0, sizeof(hw)); | ||
| 110 | for (i = 0; i <= 7; i++) | 111 | for (i = 0; i <= 7; i++) |
| 111 | hw.io_ports_array[i] = | 112 | hw.io_ports_array[i] = |
| 112 | (unsigned long)(base + ((0x1f0 + i) << 5)); | 113 | (unsigned long)(base + ((0x1f0 + i) << 5)); |