aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorShan Hai <shan.hai@windriver.com>2013-03-18 10:30:43 +0800
committerJeff Garzik <jgarzik@redhat.com>2013-04-03 19:33:40 -0400
commitd8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82 (patch)
tree855e29baf8416d41edca4cad42e85e96d574072c /include/linux
parentda241efcd9c3da2af6ba20055c7e158ec725005c (diff)
downloadvexpress-lsk-d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82.tar.gz
libata: Use integer return value for atapi_command_packet_set
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. Cc: stable@vger.kernel.org Signed-off-by: Shan Hai <shan.hai@windriver.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 8f7a3d68371..ee0bd952405 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -954,7 +954,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;
}