Commit 30c27819 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] bsg: fix incorrect device_status value
  [SCSI] Fix VPD inquiry page wrapper
parents ef2533da 47897160

block/bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, 
	/*

	 * fill in all the output members

	 */

	hdr->device_status = status_byte(rq->errors);

	hdr->device_status = rq->errors & 0xff;

	hdr->transport_status = host_byte(rq->errors);

	hdr->driver_status = driver_byte(rq->errors);

	hdr->info = 0;

drivers/scsi/scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1046,13 +1046,13 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, 


	/* If the user actually wanted this page, we can skip the rest */

	if (page == 0)

		return -EINVAL;

		return 0;



	for (i = 0; i < min((int)buf[3], buf_len - 4); i++)

		if (buf[i + 4] == page)

			goto found;



	if (i < buf[3] && i > buf_len)

	if (i < buf[3] && i >= buf_len - 4)

		/* ran off the end of the buffer, give us benefit of doubt */

		goto found;

	/* The device claims it doesn't support the requested page */