Commit 611ffd8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 46c4c9d1 e39cdacf

drivers/pcmcia/i82092.c

+1 −0
Original line number Diff line number Diff line
@@ -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;