Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 34c69b601b2ec8fc8ff6657a547ce3865d58e220

Authored by Bartlomiej Zolnierkiewicz
1 parent c1f50cbb06
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ide: don't BUG() on unsupported transfer modes 

Fix ide-cris, cs5530, sc1200 and sis5513 host drivers to just return instead
of OOPS-ing for unsupported modes in ->set_dma_mode methods.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 4 changed files with 3 additions and 7 deletions Side-by-side Diff

drivers/ide/cris/ide-cris.c
Diff comments   View file @ 34c69b6
... ... @@ -748,8 +748,7 @@
748 748 hold = ATA_DMA2_HOLD;
749 749 break;
750 750 default:
751   - BUG();
752   - break;
  751 + return;
753 752 }
754 753  
755 754 if (speed >= XFER_UDMA_0)
drivers/ide/pci/cs5530.c
Diff comments   View file @ 34c69b6
... ... @@ -117,8 +117,7 @@
117 117 case XFER_MW_DMA_1: timings = 0x00012121; break;
118 118 case XFER_MW_DMA_2: timings = 0x00002020; break;
119 119 default:
120   - BUG();
121   - break;
  120 + return;
122 121 }
123 122 basereg = CS5530_BASEREG(drive->hwif);
124 123 reg = inl(basereg + 4); /* get drive0 config register */
drivers/ide/pci/sc1200.c
Diff comments   View file @ 34c69b6
... ... @@ -186,8 +186,7 @@
186 186 }
187 187 break;
188 188 default:
189   - BUG();
190   - break;
  189 + return;
191 190 }
192 191  
193 192 if (unit == 0) { /* are we configuring drive0? */
drivers/ide/pci/sis5513.c
Diff comments   View file @ 34c69b6
... ... @@ -356,7 +356,6 @@
356 356 sis_program_timings(drive, speed);
357 357 break;
358 358 default:
359   - BUG();
360 359 break;
361 360 }
362 361 }