diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 20:43:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 20:43:36 -0800 |
| commit | a8b76b491510b7591c584838d0d7922f9ffe5c2c (patch) | |
| tree | b0d9e8b9c428b59beaf3251db17a54dfc1fd1a11 /drivers/scsi/libata-scsi.c | |
| parent | 637029c6cb5efcbaa3d5831af4c1972bdd629779 (diff) | |
| parent | c3c013a2c218cdede2d2e73df01ed4f813538941 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 07b1e7cc61d..59503c9ccac 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id) { unsigned char model[41], fw[9]; + if (!libata_fua) + return 0; if (!ata_id_has_fua(id)) return 0; |