aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas/sas_host_smp.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2009-01-11 02:41:39 +0000
committerIngo Molnar <[email protected]>2009-01-11 02:41:39 +0000
commitabede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch)
tree26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/scsi/libsas/sas_host_smp.c
parentrcu: fix bug in rcutorture system-shutdown code (diff)
parentLinux 2.6.29-rc1 (diff)
downloadkernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.gz
kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/scsi/libsas/sas_host_smp.c')
-rw-r--r--drivers/scsi/libsas/sas_host_smp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c
index 16f93123271e..d110a366c48a 100644
--- a/drivers/scsi/libsas/sas_host_smp.c
+++ b/drivers/scsi/libsas/sas_host_smp.c
@@ -199,8 +199,8 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
break;
case SMP_DISCOVER:
- req->data_len =- 16;
- if (req->data_len < 0) {
+ req->data_len -= 16;
+ if ((int)req->data_len < 0) {
req->data_len = 0;
error = -EINVAL;
goto out;
@@ -215,8 +215,8 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
break;
case SMP_REPORT_PHY_SATA:
- req->data_len =- 16;
- if (req->data_len < 0) {
+ req->data_len -= 16;
+ if ((int)req->data_len < 0) {
req->data_len = 0;
error = -EINVAL;
goto out;
@@ -238,8 +238,8 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
break;
case SMP_PHY_CONTROL:
- req->data_len =- 44;
- if (req->data_len < 0) {
+ req->data_len -= 44;
+ if ((int)req->data_len < 0) {
req->data_len = 0;
error = -EINVAL;
goto out;