diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/ide/ide-dma.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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: |