D23730.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D23730.diff
View Options

	Index: sys/dev/altera/sdcard/altera_sdcard_io.c
	===================================================================
	--- sys/dev/altera/sdcard/altera_sdcard_io.c
	+++ sys/dev/altera/sdcard/altera_sdcard_io.c
	@@ -293,27 +293,27 @@
	}

	static void
	-altera_sdcard_io_start_internal(struct altera_sdcard_softc sc, struct bio *bp)
	+altera_sdcard_io_start_internal(struct altera_sdcard_softc sc, struct bio *bpp)
	{

	- switch (*bp->bio_cmd) {
	+ switch ((*bpp)->bio_cmd) {
	case BIO_READ:
	- altera_sdcard_write_cmd_arg(sc, bp->bio_pblkno
	+ altera_sdcard_write_cmd_arg(sc, (bpp)->bio_pblkno
	ALTERA_SDCARD_SECTORSIZE);
	altera_sdcard_write_cmd(sc, ALTERA_SDCARD_CMD_READ_BLOCK);
	break;

	case BIO_WRITE:
	- altera_sdcard_write_rxtx_buffer(sc, *bp->bio_data,
	- *bp->bio_bcount);
	- altera_sdcard_write_cmd_arg(sc, bp->bio_pblkno
	+ altera_sdcard_write_rxtx_buffer(sc, (*bpp)->bio_data,
	+ (*bpp)->bio_bcount);
	+ altera_sdcard_write_cmd_arg(sc, (bpp)->bio_pblkno
	ALTERA_SDCARD_SECTORSIZE);
	altera_sdcard_write_cmd(sc, ALTERA_SDCARD_CMD_WRITE_BLOCK);
	break;

	default:
	- biofinish(*bp, NULL, EOPNOTSUPP);
	- *bp = NULL;
	+ biofinish(*bpp, NULL, EOPNOTSUPP);
	+ *bpp = NULL;
	}
	}

	@@ -333,7 +333,7 @@
	KASSERT(bp->bio_bcount == ALTERA_SDCARD_SECTORSIZE,
	("%s: I/O size not %d", __func__, ALTERA_SDCARD_SECTORSIZE));
	altera_sdcard_io_start_internal(sc, &bp);
	- sc->as_currentbio = *bp;
	+ sc->as_currentbio = bp;
	sc->as_retriesleft = ALTERA_SDCARD_RETRY_LIMIT;
	}