| From d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82 Mon Sep 17 00:00:00 2001 |
| From: Shan Hai <shan.hai@windriver.com> |
| Date: Mon, 18 Mar 2013 10:30:43 +0800 |
| Subject: libata: Use integer return value for atapi_command_packet_set |
| |
| From: Shan Hai <shan.hai@windriver.com> |
| |
| 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> |
| |
| --- |
| include/linux/ata.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/include/linux/ata.h |
| +++ b/include/linux/ata.h |
| @@ -937,7 +937,7 @@ static inline int atapi_cdb_len(const u1 |
| } |
| } |
| |
| -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; |
| } |
