diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
| commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
| tree | 2320a92b1aed2c9475e291d75c92616af75e195a /drivers/ide/ide-dma.c | |
| parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into bcm43xx
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: |