| From f46e7cd36b5f2ce2bfb567e278a10ca717f85b84 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 24 Oct 2016 17:51:55 +0200 |
| Subject: scsi: advansys: fix build warning for PCI=n |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit f46e7cd36b5f2ce2bfb567e278a10ca717f85b84 upstream. |
| |
| The advansys probe function tries to handle both ISA and PCI cases, each |
| hidden in an #ifdef when unused. This leads to a warning indicating that |
| when PCI is disabled we could be using uninitialized data: |
| |
| drivers/scsi/advansys.c: In function advansys_board_found : |
| drivers/scsi/advansys.c:11036:5: error: ret may be used uninitialized in this function [-Werror=maybe-uninitialized] |
| drivers/scsi/advansys.c:10928:28: note: ret was declared here |
| drivers/scsi/advansys.c:11309:8: error: share_irq may be used uninitialized in this function [-Werror=maybe-uninitialized] |
| drivers/scsi/advansys.c:10928:6: note: share_irq was declared here |
| |
| This cannot happen in practice because the hardware in question only |
| exists for PCI, but changing the code to just error out here is better |
| for consistency and avoids the warning. |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Reviewed-by: Hannes Reinecke <hare@suse.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/advansys.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/scsi/advansys.c |
| +++ b/drivers/scsi/advansys.c |
| @@ -11030,6 +11030,9 @@ static int advansys_board_found(struct S |
| ASC_DBG(2, "AdvInitGetConfig()\n"); |
| |
| ret = AdvInitGetConfig(pdev, shost) ? -ENODEV : 0; |
| +#else |
| + share_irq = 0; |
| + ret = -ENODEV; |
| #endif /* CONFIG_PCI */ |
| } |
| |
