diff options
Diffstat (limited to 'drivers/scsi/hptiop.c')
-rw-r--r-- | drivers/scsi/hptiop.c | 8 |
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 @@ | |||
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/gfp.h> | ||
28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
30 | #include <asm/div64.h> | 31 | #include <asm/div64.h> |
@@ -834,7 +835,7 @@ static int hptiop_reset_hba(struct hptiop_hba *hba) | |||
834 | atomic_read(&hba->resetting) == 0, 60 * HZ); | 835 | atomic_read(&hba->resetting) == 0, 60 * HZ); |
835 | 836 | ||
836 | if (atomic_read(&hba->resetting)) { | 837 | if (atomic_read(&hba->resetting)) { |
837 | /* IOP is in unkown state, abort reset */ | 838 | /* IOP is in unknown state, abort reset */ |
838 | printk(KERN_ERR "scsi%d: reset failed\n", hba->host->host_no); | 839 | printk(KERN_ERR "scsi%d: reset failed\n", hba->host->host_no); |
839 | return -1; | 840 | return -1; |
840 | } | 841 | } |
@@ -861,10 +862,13 @@ static int hptiop_reset(struct scsi_cmnd *scp) | |||
861 | } | 862 | } |
862 | 863 | ||
863 | static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev, | 864 | static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev, |
864 | int queue_depth) | 865 | int queue_depth, int reason) |
865 | { | 866 | { |
866 | struct hptiop_hba *hba = (struct hptiop_hba *)sdev->host->hostdata; | 867 | struct hptiop_hba *hba = (struct hptiop_hba *)sdev->host->hostdata; |
867 | 868 | ||
869 | if (reason != SCSI_QDEPTH_DEFAULT) | ||
870 | return -EOPNOTSUPP; | ||
871 | |||
868 | if (queue_depth > hba->max_requests) | 872 | if (queue_depth > hba->max_requests) |
869 | queue_depth = hba->max_requests; | 873 | queue_depth = hba->max_requests; |
870 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); | 874 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); |