Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed908fa1 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-pmac: macio resource freeing bugfix 



Release DMA resource before zeroing pmif.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ed1f7889

drivers/ide/ppc/pmac.c

+3 −3
Original line number Diff line number Diff line
@@ -1228,12 +1228,12 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) 
		/* The inteface is released to the common IDE layer */

		dev_set_drvdata(&mdev->ofdev.dev, NULL);

		iounmap(base);

		if (pmif->dma_regs)

		if (pmif->dma_regs) {

			iounmap(pmif->dma_regs);

			macio_release_resource(mdev, 1);

		}

		memset(pmif, 0, sizeof(*pmif));

		macio_release_resource(mdev, 0);

		if (pmif->dma_regs)

			macio_release_resource(mdev, 1);

	}



	return rc;