summaryrefslogtreecommitdiff
path: root/drivers/tty/mxser.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2021-06-18 09:14:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-18 14:10:02 +0300
commitad1c92ff6ee948584603ef2e004704cfceb899a4 (patch)
tree52b94329f8ac33f0b3b0b61aa58e5e0494f7a3d5 /drivers/tty/mxser.c
parentf8b6b327aa73dd69577abd4e164447a9cc124315 (diff)
downloadlinux-ad1c92ff6ee948584603ef2e004704cfceb899a4.tar.xz
mxser: alloc only needed # of ports
Many boards have only 2 ports. But we always allocate 8 ports (struct mxser_port) in each struct mxser_board. Switch this to an empty/variable sized array ([]) and allocate the needed number of ports using struct_size helper in ->probe. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Link: https://lore.kernel.org/r/20210618061516.662-54-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/mxser.c')
-rw-r--r--drivers/tty/mxser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 0e99225e260f..81e2b72fca3f 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -275,7 +275,7 @@ struct mxser_board {
enum mxser_must_hwid must_hwid;
speed_t max_baud;
- struct mxser_port ports[MXSER_PORTS_PER_BOARD];
+ struct mxser_port ports[];
};
static DECLARE_BITMAP(mxser_boards, MXSER_BOARDS);
@@ -1923,7 +1923,8 @@ static int mxser_probe(struct pci_dev *pdev,
goto err;
}
- brd = devm_kzalloc(&pdev->dev, sizeof(*brd), GFP_KERNEL);
+ brd = devm_kzalloc(&pdev->dev, struct_size(brd, ports, nports),
+ GFP_KERNEL);
if (!brd)
goto err;