diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /drivers/s390/block | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dasd_eer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index dd88803e4899..7158f9528ecc 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c | |||
| @@ -701,7 +701,7 @@ int __init dasd_eer_init(void) | |||
| 701 | void dasd_eer_exit(void) | 701 | void dasd_eer_exit(void) |
| 702 | { | 702 | { |
| 703 | if (dasd_eer_dev) { | 703 | if (dasd_eer_dev) { |
| 704 | WARN_ON(misc_deregister(dasd_eer_dev) != 0); | 704 | misc_deregister(dasd_eer_dev); |
| 705 | kfree(dasd_eer_dev); | 705 | kfree(dasd_eer_dev); |
| 706 | dasd_eer_dev = NULL; | 706 | dasd_eer_dev = NULL; |
| 707 | } | 707 | } |