Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756465AbYCQTds (ORCPT ); Mon, 17 Mar 2008 15:33:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752596AbYCQTdi (ORCPT ); Mon, 17 Mar 2008 15:33:38 -0400 Received: from mail0.lsil.com ([147.145.40.20]:45689 "EHLO mail0.lsil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752312AbYCQTdh (ORCPT ); Mon, 17 Mar 2008 15:33:37 -0400 Subject: [PATCH 1/4] scsi: megaraid_sas - Rollback the sense info implementation From: bo yang To: James Bottomley Cc: linux-scsi@vger.kernel.org, akpm@osdl.org, linux-kernel@vger.kernel.org, "Patro, Sumant" , nella.kolli@lsi.com, bo.yang@lsi.com In-Reply-To: <9738BCBE884FDB42801FAD8A7769C26501C9A4AF@NAMAIL1.ad.lsil.com> References: <9738BCBE884FDB42801FAD8A7769C26501CE50E4@NAMAIL1.ad.lsil.com> <1195251505.3407.30.camel@localhost.localdomain> <9738BCBE884FDB42801FAD8A7769C26501C9A4AF@NAMAIL1.ad.lsil.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Tue, 18 Mar 2008 03:13:06 -0400 Message-Id: <1205824386.7238.7.camel@pcp021067pcs.se.lsil.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.2 (2.0.2-35.0.4.el4) X-OriginalArrivalTime: 17 Mar 2008 19:32:52.0146 (UTC) FILETIME=[B0ED1120:01C88865] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1678 Lines: 45 Rollback the sense info implementation Signed-off-by Bo Yang --- drivers/scsi/megaraid/megaraid_sas.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff -rupN linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.c linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.c --- linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.c 2008-03-07 10:59:53.000000000 -0500 +++ linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.c 2008-03-17 13:47:08.000000000 -0400 @@ -2909,7 +2909,6 @@ megasas_mgmt_fw_ioctl(struct megasas_ins void *sense = NULL; dma_addr_t sense_handle; u32 *sense_ptr; - unsigned long *sense_buff; memset(kbuff_arr, 0, sizeof(kbuff_arr)); @@ -3014,14 +3013,14 @@ megasas_mgmt_fw_ioctl(struct megasas_ins */ if (ioc->sense_len) { /* - * sense_buff points to the location that has the user + * sense_ptr points to the location that has the user * sense buffer address */ - sense_buff = (unsigned long *) ((unsigned long)ioc->frame.raw + - ioc->sense_off); + sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw + + ioc->sense_off); - if (copy_to_user((void __user *)(unsigned long)(*sense_buff), - sense, ioc->sense_len)) { + if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)), + sense, ioc->sense_len)) { printk(KERN_ERR "megasas: Failed to copy out to user " "sense data\n"); error = -EFAULT; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/