diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /drivers/scsi/libata-scsi.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
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 07b1e7cc61df..59503c9ccac9 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) | |||
| 1708 | { | 1708 | { |
| 1709 | unsigned char model[41], fw[9]; | 1709 | unsigned char model[41], fw[9]; |
| 1710 | 1710 | ||
| 1711 | if (!libata_fua) | ||
| 1712 | return 0; | ||
| 1711 | if (!ata_id_has_fua(id)) | 1713 | if (!ata_id_has_fua(id)) |
| 1712 | return 0; | 1714 | return 0; |
| 1713 | 1715 | ||