diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:48:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:48:49 +0100 |
| commit | f6b2ce79b5fbbb330f56262f0f4373d6af60b602 (patch) | |
| tree | 1228dd9989b03011b9c5b5bd193283dfa8321ec4 /drivers/scsi/hpsa.c | |
| parent | serial: 8250: Fix mismerge regarding serial_lsr_in() (diff) | |
| parent | Linux 6.2-rc7 (diff) | |
| download | linux-f6b2ce79b5fbbb330f56262f0f4373d6af60b602.tar.xz linux-f6b2ce79b5fbbb330f56262f0f4373d6af60b602.zip | |
Merge 6.2-rc7 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 4dbf51e2623a..f6da34850af9 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -5850,7 +5850,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h) { struct Scsi_Host *sh; - sh = scsi_host_alloc(&hpsa_driver_template, sizeof(h)); + sh = scsi_host_alloc(&hpsa_driver_template, sizeof(struct ctlr_info)); if (sh == NULL) { dev_err(&h->pdev->dev, "scsi_host_alloc failed\n"); return -ENOMEM; |