Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6.git] / drivers / scsi / scsi_error.c

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 28a266c804be7a89913de614b5a48c041932f143..3963e7013bd90eca80df51c268427a4f3107af32 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -725,7 +725,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
         */
        if (copy_sense) {
                if (!SCSI_SENSE_VALID(scmd)) {
         */
        if (copy_sense) {
                if (!SCSI_SENSE_VALID(scmd)) {

-                       memcpy(scmd->sense_buffer, scmd->request_buffer,
+                       memcpy(scmd->sense_buffer, page_address(sgl.page),

                               sizeof(scmd->sense_buffer));
                }
                __free_page(sgl.page);
                               sizeof(scmd->sense_buffer));
                }
                __free_page(sgl.page);