Commit 9803ab17 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fix from James Bottomley:
 "Just one fix in libsas for a resource leak in an error path"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: libsas: Fix error path in sas_notify_lldd_dev_found()
parents 1e484d38 244359c9
...@@ -182,10 +182,11 @@ int sas_notify_lldd_dev_found(struct domain_device *dev) ...@@ -182,10 +182,11 @@ int sas_notify_lldd_dev_found(struct domain_device *dev)
pr_warn("driver on host %s cannot handle device %016llx, error:%d\n", pr_warn("driver on host %s cannot handle device %016llx, error:%d\n",
dev_name(sas_ha->dev), dev_name(sas_ha->dev),
SAS_ADDR(dev->sas_addr), res); SAS_ADDR(dev->sas_addr), res);
return res;
} }
set_bit(SAS_DEV_FOUND, &dev->state); set_bit(SAS_DEV_FOUND, &dev->state);
kref_get(&dev->kref); kref_get(&dev->kref);
return res; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment