[PATCH] fix IDE init oops on PowerMac

From Mikael Petterson:

  Booting kernel 2.5.74 on a PowerMac with CONFIG_BLK_DEV_IDE_PMAC=y
  results in an oops during IDE init, and the box then reboots.

  The patch below updates drivers/ide/ppc/pmac.c to also set up the
  hwif->ide_dma_queued_off and hwif->ide_dma_queued_on function
  pointers, which fixes the oops. Tested on my ancient PM4400.

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index f86304224663ccb28bad867146c51870c32832ab..8cdcb9a0a736d06e5c5b7a0dfc2aee09843a8993 100644 (file)
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1514,6 +1514,8 @@ pmac_ide_setup_dma(struct device_node *np, int ix)
        ide_hwifs[ix].ide_dma_timeout = &__ide_dma_timeout;
        ide_hwifs[ix].ide_dma_retune = &__ide_dma_retune;
        ide_hwifs[ix].ide_dma_lostirq = &pmac_ide_dma_lostirq;
+       ide_hwifs[ix].ide_dma_queued_on = &__ide_dma_queued_on;
+       ide_hwifs[ix].ide_dma_queued_off = &__ide_dma_queued_off;
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
        if (!noautodma)