path: root/drivers/scsi
diff options
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2013-11-01 11:02:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-11 22:36:27 -0800
commit4fa7273a3f09508923408f7c1b0f9156329bded1 (patch)
treeada0b8ceed7a979f36bf4c066bef55af491389b4 /drivers/scsi
parentf9c848e607ca4ac52a35ac56402989505dd61a23 (diff)
SCSI: hpsa: return 0 from driver probe function on success, not 1
commit 88bf6d62db4393fa03a58bada9d746312d5b496f upstream. A return value of 1 is interpreted as an error. See pci_driver. in local_pci_probe(). If you're wondering how this ever could have worked, it's because it used to be the case that only return values less than zero were interpreted as failure. But even in the current kernel if the driver registers its various entry points with the kernel, and then returns a value which is interpreted as failure, those registrations aren't undone, so the driver still mostly works. However, the driver's remove function wouldn't be called on rmmod, and pci power management functions wouldn't work. In the case of Smart Array, since it has a battery backed cache (or else no cache) even if the driver is not shut down properly as long as there is no outstanding i/o, nothing too bad happens, which is why it took so long to notice. Requesting backport to stable because the change to pci-driver.c which requires driver probe functions to return 0 occurred between 2.6.35 and 2.6.36 (the pci power management breakage) and again between 3.7 and 3.8 (pci_dev->driver getting set to NULL in local_pci_probe() preventing driver remove function from being called on rmmod.) Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 603ef4961d3e..8e292aa11c0a 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4904,7 +4904,7 @@ reinit_after_soft_reset:
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
- return 1;
+ return 0;