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

Commit fbf14e2f authored by Byron Bradley's avatar Byron Bradley Committed by Jeff Garzik
Browse files

sata_mv: platform driver allocs dma without create 



When the sata_mv driver is used as a platform driver,
mv_create_dma_pools() is never called so it fails when trying
to alloc in mv_pool_start().

Signed-off-by: default avatarByron Bradley <byron.bbradley@gmail.com>
Acked-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 41946450

drivers/ata/sata_mv.c

+24 −20
Original line number Diff line number Diff line
@@ -2881,6 +2881,26 @@ done: 
	return rc;

}



static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev)

{

	hpriv->crqb_pool   = dmam_pool_create("crqb_q", dev, MV_CRQB_Q_SZ,

							     MV_CRQB_Q_SZ, 0);

	if (!hpriv->crqb_pool)

		return -ENOMEM;



	hpriv->crpb_pool   = dmam_pool_create("crpb_q", dev, MV_CRPB_Q_SZ,

							     MV_CRPB_Q_SZ, 0);

	if (!hpriv->crpb_pool)

		return -ENOMEM;



	hpriv->sg_tbl_pool = dmam_pool_create("sg_tbl", dev, MV_SG_TBL_SZ,

							     MV_SG_TBL_SZ, 0);

	if (!hpriv->sg_tbl_pool)

		return -ENOMEM;



	return 0;

}



/**

 *      mv_platform_probe - handle a positive probe of an soc Marvell

 *      host
@@ -2934,6 +2954,10 @@ static int mv_platform_probe(struct platform_device *pdev) 
	hpriv->base = ioremap(res->start, res->end - res->start + 1);

	hpriv->base -= MV_SATAHC0_REG_BASE;



	rc = mv_create_dma_pools(hpriv, &pdev->dev);

	if (rc)

		return rc;



	/* initialize adapter */

	rc = mv_init_host(host, chip_soc);

	if (rc)
@@ -3070,26 +3094,6 @@ static void mv_print_info(struct ata_host *host) 
	       scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx");

}



static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev)

{

	hpriv->crqb_pool   = dmam_pool_create("crqb_q", dev, MV_CRQB_Q_SZ,

							     MV_CRQB_Q_SZ, 0);

	if (!hpriv->crqb_pool)

		return -ENOMEM;



	hpriv->crpb_pool   = dmam_pool_create("crpb_q", dev, MV_CRPB_Q_SZ,

							     MV_CRPB_Q_SZ, 0);

	if (!hpriv->crpb_pool)

		return -ENOMEM;



	hpriv->sg_tbl_pool = dmam_pool_create("sg_tbl", dev, MV_SG_TBL_SZ,

							     MV_SG_TBL_SZ, 0);

	if (!hpriv->sg_tbl_pool)

		return -ENOMEM;



	return 0;

}



/**

 *      mv_pci_init_one - handle a positive probe of a PCI Marvell host

 *      @pdev: PCI device found