Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcmcia: ensure correct logging in do_io_probe

Browse source 
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2008-11-09 21:47:47 +01:00
parent 980fc29f20
commit b1769450da
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/pcmcia/cs.c
View file

@ -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)
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);