Date: Sun, 24 Mar 2013 17:23:10 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248689 - head/sys/dev/mmc Message-ID: <201303241723.r2OHNAY2056837@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sun Mar 24 17:23:10 2013 New Revision: 248689 URL: http://svnweb.freebsd.org/changeset/base/248689 Log: Set the backlink in mmc commands to the mmc request that contains them. Modified: head/sys/dev/mmc/mmc.c head/sys/dev/mmc/mmcsd.c Modified: head/sys/dev/mmc/mmc.c ============================================================================== --- head/sys/dev/mmc/mmc.c Sun Mar 24 16:53:08 2013 (r248688) +++ head/sys/dev/mmc/mmc.c Sun Mar 24 17:23:10 2013 (r248689) @@ -412,6 +412,7 @@ mmc_wait_for_cmd(struct mmc_softc *sc, s memset(&mreq, 0, sizeof(mreq)); memset(cmd->resp, 0, sizeof(cmd->resp)); cmd->retries = retries; + cmd->mrq = &mreq; mreq.cmd = cmd; mmc_wait_for_req(sc, &mreq); return (cmd->error); Modified: head/sys/dev/mmc/mmcsd.c ============================================================================== --- head/sys/dev/mmc/mmcsd.c Sun Mar 24 16:53:08 2013 (r248688) +++ head/sys/dev/mmc/mmcsd.c Sun Mar 24 17:23:10 2013 (r248689) @@ -322,6 +322,7 @@ mmcsd_rw(struct mmcsd_softc *sc, struct memset(&req, 0, sizeof(req)); memset(&cmd, 0, sizeof(cmd)); memset(&stop, 0, sizeof(stop)); + cmd.mrq = &req; req.cmd = &cmd; cmd.data = &data; if (bp->bio_cmd == BIO_READ) { @@ -351,6 +352,7 @@ mmcsd_rw(struct mmcsd_softc *sc, struct stop.opcode = MMC_STOP_TRANSMISSION; stop.arg = 0; stop.flags = MMC_RSP_R1B | MMC_CMD_AC; + stop.mrq = &req; req.stop = &stop; } MMCBUS_WAIT_FOR_REQUEST(device_get_parent(dev), dev, @@ -398,6 +400,7 @@ mmcsd_delete(struct mmcsd_softc *sc, str /* Set erase start position. */ memset(&req, 0, sizeof(req)); memset(&cmd, 0, sizeof(cmd)); + cmd.mrq = &req; req.cmd = &cmd; if (mmc_get_card_type(dev) == mode_sd) cmd.opcode = SD_ERASE_WR_BLK_START;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303241723.r2OHNAY2056837>