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

Commit 4f2ef124 authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] Fix breakage in simscsi.c 



arch/ia64/hp/sim/simscsi.c: In function `simscsi_sg_readwrite':
arch/ia64/hp/sim/simscsi.c:154: error: structure has no member named `buffer'
arch/ia64/hp/sim/simscsi.c: In function `simscsi_fillresult':
arch/ia64/hp/sim/simscsi.c:247: error: structure has no member named `buffer'

hch said:
>Just change it to access the request_buffer member instead.  buffer
>and request_buffer have been synonymous 99% of the time, and a driver
>never even wants to access buffer.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 1bf1eba7

arch/ia64/hp/sim/simscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void 
simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset)

{

	int list_len = sc->use_sg;

	struct scatterlist *sl = (struct scatterlist *)sc->buffer;

	struct scatterlist *sl = (struct scatterlist *)sc->request_buffer;

	struct disk_stat stat;

	struct disk_req req;
@@ -244,7 +244,7 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len) 


	if (scatterlen == 0)

		memcpy(sc->request_buffer, buf, len);

	else for (slp = (struct scatterlist *)sc->buffer; scatterlen-- > 0 && len > 0; slp++) {

	else for (slp = (struct scatterlist *)sc->request_buffer; scatterlen-- > 0 && len > 0; slp++) {

		unsigned thislen = min(len, slp->length);



		memcpy(page_address(slp->page) + slp->offset, buf, thislen);