From: Christoph Hellwig <hch@lst.de>
To: luben_tuikov@adaptec.com
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH] fix aic79xx module_init return value when no hardware present
Date: Mon, 6 Sep 2004 20:53:37 +0200 [thread overview]
Message-ID: <20040906185337.GA25764@lst.de> (raw)
So much rearranging to just propagate the pci_module_init return value..
--- 1.56/drivers/scsi/aic7xxx/aic79xx_osm.c 2004-08-25 01:09:04 +02:00
+++ edited/drivers/scsi/aic7xxx/aic79xx_osm.c 2004-09-06 20:46:53 +02:00
@@ -851,6 +851,7 @@
{
struct ahd_softc *ahd;
int found;
+ int error = 0;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
/*
@@ -902,7 +903,9 @@
ahd_list_lockinit();
#ifdef CONFIG_PCI
- ahd_linux_pci_init();
+ error = ahd_linux_pci_init();
+ if (error)
+ return error;
#endif
/*
@@ -919,7 +922,7 @@
spin_lock_irq(&io_request_lock);
#endif
aic79xx_detect_complete++;
- return (found);
+ return 0;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
@@ -5073,7 +5076,7 @@
ahd_linux_init(void)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
- return (ahd_linux_detect(&aic79xx_driver_template) ? 0 : -ENODEV);
+ return ahd_linux_detect(&aic79xx_driver_template);
#else
scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template);
if (aic79xx_driver_template.present == 0) {
next reply other threads:[~2004-09-06 18:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-06 18:53 Christoph Hellwig [this message]
2004-09-08 12:59 ` [PATCH] fix aic79xx module_init return value when no hardware present Luben Tuikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040906185337.GA25764@lst.de \
--to=hch@lst.de \
--cc=linux-scsi@vger.kernel.org \
--cc=luben_tuikov@adaptec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox