diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 12:54:23 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 16:26:10 -0400 |
| commit | e51f31ad716a485ed5bada8d367df60d6a99b9ac (patch) | |
| tree | 9e1f935a8373955a725e030bad07600a7b97338b /drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | |
| parent | 3cfcdc4d74dc3c9590b16dbb6added4d0d7ae2e7 (diff) | |
| parent | 0df021b2e841eded862ebc3b61532e7c73965535 (diff) | |
Merge tag 'v4.19.47' into v4.19-rt
This is the 4.19.47 stable release
Conflicts:
drivers/char/random.c
kernel/irq_work.c
Issues with kernel/irq/manage.c
A use after free bug was fixed in stable. But it requires a backport of changes
from rt-devel. The bug still exists in this tree for PREEMPT_RT, but will be
fixed when backporting the rt-devel patches.
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm_pci.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c index 0fc14dac7070..717d8d1082ce 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c @@ -250,6 +250,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } } ahc->dev_softc = pci; + ahc->dev = &pci->dev; error = ahc_pci_config(ahc, entry); if (error != 0) { ahc_free(ahc); |