Commit b1769450 authored by Dominik Brodowski's avatar Dominik Brodowski

pcmcia: ensure correct logging in do_io_probe

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 980fc29f
...@@ -186,12 +186,6 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) ...@@ -186,12 +186,6 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
spin_lock_init(&socket->lock); spin_lock_init(&socket->lock);
if (socket->resource_ops->init) {
ret = socket->resource_ops->init(socket);
if (ret)
return (ret);
}
/* try to obtain a socket number [yes, it gets ugly if we /* try to obtain a socket number [yes, it gets ugly if we
* register more than 2^sizeof(unsigned int) pcmcia * register more than 2^sizeof(unsigned int) pcmcia
* sockets... but the socket number is deprecated * sockets... but the socket number is deprecated
...@@ -239,6 +233,12 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) ...@@ -239,6 +233,12 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
mutex_init(&socket->skt_mutex); mutex_init(&socket->skt_mutex);
spin_lock_init(&socket->thread_lock); spin_lock_init(&socket->thread_lock);
if (socket->resource_ops->init) {
ret = socket->resource_ops->init(socket);
if (ret)
goto err;
}
tsk = kthread_run(pccardd, socket, "pccardd"); tsk = kthread_run(pccardd, socket, "pccardd");
if (IS_ERR(tsk)) { if (IS_ERR(tsk)) {
ret = PTR_ERR(tsk); ret = PTR_ERR(tsk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment