Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4f1ac21 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: do not initialize the present flag too late. 



The "present" flag was initialized too late -- possibly, a card
was already registered at this time, so re-setting the flag to 0
caused pcmcia_dev_present() to fail.

Reported-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 815c4163

drivers/pcmcia/ds.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1356,6 +1356,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev, 
	INIT_LIST_HEAD(&socket->devices_list);

	INIT_LIST_HEAD(&socket->devices_list);

	memset(&socket->pcmcia_state, 0, sizeof(u8));

	memset(&socket->pcmcia_state, 0, sizeof(u8));

	socket->device_count = 0;

	socket->device_count = 0;

	atomic_set(&socket->present, 0);





	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);

	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);

	if (ret) {

	if (ret) {
@@ -1364,8 +1365,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev, 
		return ret;

		return ret;

	}

	}





	atomic_set(&socket->present, 0);



	return 0;

	return 0;

}

}