Commit 7d7ba8d3 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: allow for four multifunction subdevices (again) 



Commit aa584ca4 broke what 6cf5be51 had already fixed: there may
be four multifunction devices, but just two pseudo-multifunction
devices per PCMCIA card.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 9713ab28

drivers/pcmcia/ds.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -509,8 +509,12 @@ struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int fu 
	p_dev->device_no = (s->device_count++);

	p_dev->device_no = (s->device_count++);

	mutex_unlock(&s->ops_mutex);

	mutex_unlock(&s->ops_mutex);





	/* max of 2 devices per card */

	/* max of 2 PFC devices */

	if (p_dev->device_no >= 2)

	if ((p_dev->device_no >= 2) && (function == 0))

		goto err_free;



	/* max of 4 devices overall */

	if (p_dev->device_no >= 4)

		goto err_free;

		goto err_free;





	p_dev->socket = s;

	p_dev->socket = s;