From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130507035843.092818112@goodmis.org> Date: Mon, 06 May 2013 23:57:25 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shan Hai , Jeff Garzik Subject: [013/126] libata: Use integer return value for atapi_command_packet_set References: <20130507035712.909872333@goodmis.org> Content-Disposition: inline; filename=0013-libata-Use-integer-return-value-for-atapi_command_pa.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.3 stable review patch. If anyone has any objections, please let me know. ------------------ From: Shan Hai [ Upstream commit d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82 ] 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 Signed-off-by: Jeff Garzik Signed-off-by: Steven Rostedt --- include/linux/ata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/ata.h b/include/linux/ata.h index 5713d3a..b07e008 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -938,7 +938,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; } -- 1.7.10.4