projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[linux-2.6-microblaze.git]
/
drivers
/
scsi
/
eata.c
diff --git
a/drivers/scsi/eata.c
b/drivers/scsi/eata.c
index
943ad3a
..
227dd2c
100644
(file)
--- a/
drivers/scsi/eata.c
+++ b/
drivers/scsi/eata.c
@@
-946,20
+946,18
@@
static int eata2x_slave_configure(struct scsi_device *dev)
if (TLDEV(dev->type) && dev->tagged_supported) {
if (tag_mode == TAG_SIMPLE) {
if (TLDEV(dev->type) && dev->tagged_supported) {
if (tag_mode == TAG_SIMPLE) {
- scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, tqd);
tag_suffix = ", simple tags";
} else if (tag_mode == TAG_ORDERED) {
tag_suffix = ", simple tags";
} else if (tag_mode == TAG_ORDERED) {
- scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, tqd);
tag_suffix = ", ordered tags";
} else {
tag_suffix = ", ordered tags";
} else {
- scsi_adjust_queue_depth(dev, 0, tqd);
tag_suffix = ", no tags";
}
tag_suffix = ", no tags";
}
+ scsi_change_queue_depth(dev, tqd);
} else if (TLDEV(dev->type) && linked_comm) {
} else if (TLDEV(dev->type) && linked_comm) {
- scsi_
adjust_queue_depth(dev, 0
, tqd);
+ scsi_
change_queue_depth(dev
, tqd);
tag_suffix = ", untagged";
} else {
tag_suffix = ", untagged";
} else {
- scsi_
adjust_queue_depth(dev, 0
, utqd);
+ scsi_
change_queue_depth(dev
, utqd);
tag_suffix = "";
}
tag_suffix = "";
}