Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index a0e7e711ff9d..645f7cdf21ab 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
+#include <linux/gfp.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/div64.h>
@@ -834,7 +835,7 @@ static int hptiop_reset_hba(struct hptiop_hba *hba)
                         atomic_read(&hba->resetting) == 0, 60 * HZ);
 
         if (atomic_read(&hba->resetting)) {
-                /* IOP is in unkown state, abort reset */
+                /* IOP is in unknown state, abort reset */
                 printk(KERN_ERR "scsi%d: reset failed\n", hba->host->host_no);
                 return -1;
         }
@@ -861,10 +862,13 @@ static int hptiop_reset(struct scsi_cmnd *scp)
 }
 
 static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev,
-                                                int queue_depth)
+                                          int queue_depth, int reason)
 {
         struct hptiop_hba *hba = (struct hptiop_hba *)sdev->host->hostdata;
 
+        if (reason != SCSI_QDEPTH_DEFAULT)
+                return -EOPNOTSUPP;
+
         if (queue_depth > hba->max_requests)
                 queue_depth = hba->max_requests;
         scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);