diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-05 11:16:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-05 11:16:02 -0700 |
| commit | 611ffd8acc4b06e606325ca727c891ce70adcaa6 (patch) | |
| tree | f12a176944adee822444038d8e6ff4af4bb94c48 /drivers | |
| parent | 46c4c9d1beb7f5b4cec4dd90e7728720583ee348 (diff) | |
| parent | e39cdacf2f664b09029e7c1eb354c91a20c367af (diff) | |
| download | linux-611ffd8acc4b06e606325ca727c891ce70adcaa6.tar.bz2 | |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia fix from Dominik Brodowski:
"Zheyu Ma found and fixed a null pointer dereference bug in the device
driver for the i82092 card reader"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: i82092: fix a null pointer dereference bug
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/i82092.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 85887d885b5f..192c9049d654 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c @@ -112,6 +112,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, for (i = 0; i < socket_count; i++) { sockets[i].card_state = 1; /* 1 = present but empty */ sockets[i].io_base = pci_resource_start(dev, 0); + sockets[i].dev = dev; sockets[i].socket.features |= SS_CAP_PCCARD; sockets[i].socket.map_size = 0x1000; sockets[i].socket.irq_mask = 0; |