diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/cris/ide-cris.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/cs5530.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/sc1200.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/sis5513.c | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index e196aefa2070..7f5bc2ee6c7e 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
@@ -748,8 +748,7 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
748 | hold = ATA_DMA2_HOLD; | 748 | hold = ATA_DMA2_HOLD; |
749 | break; | 749 | break; |
750 | default: | 750 | default: |
751 | BUG(); | 751 | return; |
752 | break; | ||
753 | } | 752 | } |
754 | 753 | ||
755 | if (speed >= XFER_UDMA_0) | 754 | if (speed >= XFER_UDMA_0) |
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index 599408952bd4..547690395eee 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c | |||
@@ -117,8 +117,7 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
117 | case XFER_MW_DMA_1: timings = 0x00012121; break; | 117 | case XFER_MW_DMA_1: timings = 0x00012121; break; |
118 | case XFER_MW_DMA_2: timings = 0x00002020; break; | 118 | case XFER_MW_DMA_2: timings = 0x00002020; break; |
119 | default: | 119 | default: |
120 | BUG(); | 120 | return; |
121 | break; | ||
122 | } | 121 | } |
123 | basereg = CS5530_BASEREG(drive->hwif); | 122 | basereg = CS5530_BASEREG(drive->hwif); |
124 | reg = inl(basereg + 4); /* get drive0 config register */ | 123 | reg = inl(basereg + 4); /* get drive0 config register */ |
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 0a7b3202066d..707d5ff66b03 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -186,8 +186,7 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
186 | } | 186 | } |
187 | break; | 187 | break; |
188 | default: | 188 | default: |
189 | BUG(); | 189 | return; |
190 | break; | ||
191 | } | 190 | } |
192 | 191 | ||
193 | if (unit == 0) { /* are we configuring drive0? */ | 192 | if (unit == 0) { /* are we configuring drive0? */ |
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 6b7bb53acefd..f6e2ab3dd166 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -356,7 +356,6 @@ static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
356 | sis_program_timings(drive, speed); | 356 | sis_program_timings(drive, speed); |
357 | break; | 357 | break; |
358 | default: | 358 | default: |
359 | BUG(); | ||
360 | break; | 359 | break; |
361 | } | 360 | } |
362 | } | 361 | } |