diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-22 11:11:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-22 11:11:57 -0800 |
commit | ba8b844f1b47f003d8d0af94275dc5bc7ab9665d (patch) | |
tree | 8478351ed619c8599e2714f89794da181b693062 | |
parent | 1733348bd0b245290ff7df90217761c127e7f2c6 (diff) | |
parent | ce027ed98fd176710fb14be9d6015697b62436f0 (diff) | |
download | talos-obmc-linux-ba8b844f1b47f003d8d0af94275dc5bc7ab9665d.tar.gz talos-obmc-linux-ba8b844f1b47f003d8d0af94275dc5bc7ab9665d.zip |
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fixlet from Stefan Richter:
"A one-liner to reenable WRITE SAME over SBP-2 like in v3.8...v3.12.
Buggy targets which could malfunction when being subjected to this
command are already sufficiently protected by a scsi_level check in sd
+ SCSI core"
* tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: sbp2: bring back WRITE SAME support
-rw-r--r-- | drivers/firewire/sbp2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index b0bb056458a3..281029daf98c 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1623,7 +1623,6 @@ static struct scsi_host_template scsi_driver_template = { .cmd_per_lun = 1, .can_queue = 1, .sdev_attrs = sbp2_scsi_sysfs_attrs, - .no_write_same = 1, }; MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>"); |