summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2019-08-17 04:12:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 13:25:48 +0300
commit53390efb1d09f43606d710e84b16de87575bc4e3 (patch)
treebf90ba9704b0b0f6d8625063c38f7150880d1f8e
parent7bae84821b47e2ffa87a7afcb6891dd7e61c65ef (diff)
downloadlinux-53390efb1d09f43606d710e84b16de87575bc4e3.tar.xz
media: msi2500: assign SPI bus number dynamically
commit 9c60cc797cf72e95bb39f32316e9f0e5f85435f9 upstream. SPI bus number must be assigned dynamically for each device, otherwise it will crash when multiple devices are plugged to system. Reported-and-tested-by: syzbot+c60ddb60b685777d9d59@syzkaller.appspotmail.com Cc: stable@vger.kernel.org Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/usb/msi2500/msi2500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index 65ef755adfdc..b2adde978c9b 100644
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -1250,7 +1250,7 @@ static int msi2500_probe(struct usb_interface *intf,
}
dev->master = master;
- master->bus_num = 0;
+ master->bus_num = -1;
master->num_chipselect = 1;
master->transfer_one_message = msi2500_transfer_one_message;
spi_master_set_devdata(master, dev);