diff options
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_mbox.c')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 234f0b7eb21c..a7810a106b37 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -70,6 +70,7 @@ | |||
70 | * For history of changes, see Documentation/ChangeLog.megaraid | 70 | * For history of changes, see Documentation/ChangeLog.megaraid |
71 | */ | 71 | */ |
72 | 72 | ||
73 | #include <linux/slab.h> | ||
73 | #include "megaraid_mbox.h" | 74 | #include "megaraid_mbox.h" |
74 | 75 | ||
75 | static int megaraid_init(void); | 76 | static int megaraid_init(void); |
@@ -335,12 +336,17 @@ static struct device_attribute *megaraid_sdev_attrs[] = { | |||
335 | * megaraid_change_queue_depth - Change the device's queue depth | 336 | * megaraid_change_queue_depth - Change the device's queue depth |
336 | * @sdev: scsi device struct | 337 | * @sdev: scsi device struct |
337 | * @qdepth: depth to set | 338 | * @qdepth: depth to set |
339 | * @reason: calling context | ||
338 | * | 340 | * |
339 | * Return value: | 341 | * Return value: |
340 | * actual depth set | 342 | * actual depth set |
341 | */ | 343 | */ |
342 | static int megaraid_change_queue_depth(struct scsi_device *sdev, int qdepth) | 344 | static int megaraid_change_queue_depth(struct scsi_device *sdev, int qdepth, |
345 | int reason) | ||
343 | { | 346 | { |
347 | if (reason != SCSI_QDEPTH_DEFAULT) | ||
348 | return -EOPNOTSUPP; | ||
349 | |||
344 | if (qdepth > MBOX_MAX_SCSI_CMDS) | 350 | if (qdepth > MBOX_MAX_SCSI_CMDS) |
345 | qdepth = MBOX_MAX_SCSI_CMDS; | 351 | qdepth = MBOX_MAX_SCSI_CMDS; |
346 | scsi_adjust_queue_depth(sdev, 0, qdepth); | 352 | scsi_adjust_queue_depth(sdev, 0, qdepth); |
@@ -2704,7 +2710,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp) | |||
2704 | } | 2710 | } |
2705 | else { | 2711 | else { |
2706 | con_log(CL_ANN, (KERN_NOTICE | 2712 | con_log(CL_ANN, (KERN_NOTICE |
2707 | "megaraid mbox: reset sequence completed sucessfully\n")); | 2713 | "megaraid mbox: reset sequence completed successfully\n")); |
2708 | } | 2714 | } |
2709 | 2715 | ||
2710 | 2716 | ||