git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
s390
/
cio
/
chp.c
diff --git
a/drivers/s390/cio/chp.c
b/drivers/s390/cio/chp.c
index
1246f61
..
4000283
100644
(file)
--- a/
drivers/s390/cio/chp.c
+++ b/
drivers/s390/cio/chp.c
@@
-17,8
+17,8
@@
#include <linux/errno.h>
#include <asm/chpid.h>
#include <asm/sclp.h>
#include <linux/errno.h>
#include <asm/chpid.h>
#include <asm/sclp.h>
+#include <asm/crw.h>
-#include "../s390mach.h"
#include "cio.h"
#include "css.h"
#include "ioasm.h"
#include "cio.h"
#include "css.h"
#include "ioasm.h"
@@
-417,7
+417,8
@@
int chp_new(struct chp_id chpid)
if (ret) {
CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",
chpid.cssid, chpid.id, ret);
if (ret) {
CIO_MSG_EVENT(0, "Could not register chp%x.%02x: %d\n",
chpid.cssid, chpid.id, ret);
- goto out_free;
+ put_device(&chp->dev);
+ goto out;
}
ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
if (ret) {
}
ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
if (ret) {
@@
-706,12
+707,12
@@
static int __init chp_init(void)
struct chp_id chpid;
int ret;
struct chp_id chpid;
int ret;
- ret =
s390_register_crw
_handler(CRW_RSC_CPATH, chp_process_crw);
+ ret =
crw_register
_handler(CRW_RSC_CPATH, chp_process_crw);
if (ret)
return ret;
chp_wq = create_singlethread_workqueue("cio_chp");
if (!chp_wq) {
if (ret)
return ret;
chp_wq = create_singlethread_workqueue("cio_chp");
if (!chp_wq) {
-
s390_unregister_crw
_handler(CRW_RSC_CPATH);
+
crw_unregister
_handler(CRW_RSC_CPATH);
return -ENOMEM;
}
INIT_WORK(&cfg_work, cfg_func);
return -ENOMEM;
}
INIT_WORK(&cfg_work, cfg_func);