diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/scsi/libata-scsi.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
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 | ||