Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 (8b8ce881) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/pcmcia/ds.c

+1 −2

Original line number	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);
		memset(&socket->pcmcia_state, 0, sizeof(u8));
		socket->device_count = 0;
		atomic_set(&socket->present, 0);

		ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);
		if (ret) {
		@@ -1364,8 +1365,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
		return ret;
		}

		atomic_set(&socket->present, 0);

		return 0;
		}