diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/ide/ide-dma.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 98918fb6b2ce..7c3a13e1cf64 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -750,7 +750,7 @@ void ide_dma_verbose(ide_drive_t *drive) | |||
| 750 | goto bug_dma_off; | 750 | goto bug_dma_off; |
| 751 | printk(", DMA"); | 751 | printk(", DMA"); |
| 752 | } else if (id->field_valid & 1) { | 752 | } else if (id->field_valid & 1) { |
| 753 | printk(", BUG"); | 753 | goto bug_dma_off; |
| 754 | } | 754 | } |
| 755 | return; | 755 | return; |
| 756 | bug_dma_off: | 756 | bug_dma_off: |