On 10/27/2016 12:21 AM, Don Brace wrote: > need to check if the device is already disabled first > > Reviewed-by: Scott Benesh <scott.benesh@xxxxxxxxxxxxx> > Reviewed-by: Scott Teel <scott.teel@xxxxxxxxxxxxx> > Signed-off-by: Don Brace <don.brace@xxxxxxxxxxxxx> > --- > drivers/scsi/hpsa.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > index d007ec1..798fb20 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -8456,7 +8456,8 @@ static void controller_lockup_detected(struct ctlr_info *h) > spin_unlock_irqrestore(&h->lock, flags); > dev_warn(&h->pdev->dev, "Controller lockup detected: 0x%08x after %d\n", > lockup_detected, h->heartbeat_sample_interval / HZ); > - pci_disable_device(h->pdev); > + if (pci_is_enabled(h->pdev)) > + pci_disable_device(h->pdev); > fail_all_outstanding_cmds(h); > } > > Meh. Why is pci_disable_device() not checking for it? Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@xxxxxxx +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html