diff options
| author | Shan Hai <shan.hai@windriver.com> | 2013-03-18 10:30:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-12 09:38:44 -0700 |
| commit | 57b41f6193014b2a4a67c270dd77d801fd337d98 (patch) | |
| tree | e7ba3d038511ab08027428518796f3edeaf8dc92 /include | |
| parent | 91777f102bc6c5d72bf637281b74ba96c1447850 (diff) | |
| download | linux-3.10-57b41f6193014b2a4a67c270dd77d801fd337d98.tar.gz linux-3.10-57b41f6193014b2a4a67c270dd77d801fd337d98.tar.bz2 linux-3.10-57b41f6193014b2a4a67c270dd77d801fd337d98.zip | |
libata: Use integer return value for atapi_command_packet_set
commit d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82 upstream.
The function returns type of ATAPI drives so it should return integer value.
The commit 4dce8ba94c7 (libata: Use 'bool' return value for ata_id_XXX) since
v2.6.39 changed the type of return value from int to bool, the change would
cause all of the ATAPI class drives to be treated as TYPE_TAPE and the
max_sectors of the drives to be set to 65535 because of the commit
f8d8e5799b7(libata: increase 128 KB / cmd limit for ATAPI tape drives), for the
function would return true for all ATAPI class drives and the TYPE_TAPE is
defined as 0x01.
Signed-off-by: Shan Hai <shan.hai@windriver.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 32df2b6ef0e..5856c9e0219 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -937,7 +937,7 @@ static inline int atapi_cdb_len(const u16 *dev_id) } } -static inline bool atapi_command_packet_set(const u16 *dev_id) +static inline int atapi_command_packet_set(const u16 *dev_id) { return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f; } |