diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
| commit | a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 (patch) | |
| tree | 870f95ae22f423e60f4518fd38ab8e0649769991 /drivers/ide/ide-proc.c | |
| parent | 15895b932b8a047a1db7006a4f9ca74485d5a826 (diff) | |
| parent | 4283e1babe167e0ba856bb5d039465358e90785c (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:
ide: fix /proc/ide/ide?/mate reporting
Revert "BAST: Remove old IDE driver"
Diffstat (limited to 'drivers/ide/ide-proc.c')
| -rw-r--r-- | drivers/ide/ide-proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 55ec7f79877..8af88bf0969 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c @@ -76,7 +76,7 @@ static int proc_ide_read_mate ide_hwif_t *hwif = (ide_hwif_t *) data; int len; - if (hwif && hwif->mate && hwif->mate->present) + if (hwif && hwif->mate) len = sprintf(page, "%s\n", hwif->mate->name); else len = sprintf(page, "(none)\n"); |