2 files changed, 1 insertions, 12 deletions

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index efce32e97be2..e2767e3b8cfd 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -153,19 +153,10 @@ struct raw3270_request __init *raw3270_request_alloc_bootmem(size_t size)
         struct raw3270_request *rq;
 
         rq = alloc_bootmem_low(sizeof(struct raw3270));
-        if (!rq)
-                return ERR_PTR(-ENOMEM);
-        memset(rq, 0, sizeof(struct raw3270_request));
 
         /* alloc output buffer. */
-        if (size > 0) {
+        if (size > 0)
                 rq->buffer = alloc_bootmem_low(size);
-                if (!rq->buffer) {
-                        free_bootmem((unsigned long) rq,
-                                     sizeof(struct raw3270));
-                        return ERR_PTR(-ENOMEM);
-                }
-        }
         rq->size = size;
         INIT_LIST_HEAD(&rq->list);
 
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index ead1043d788e..23bb90a5ed29 100644
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -222,8 +222,6 @@ sclp_console_init(void)
         INIT_LIST_HEAD(&sclp_con_pages);
         for (i = 0; i < MAX_CONSOLE_PAGES; i++) {
                 page = alloc_bootmem_low_pages(PAGE_SIZE);
-                if (page == NULL)
-                        return -ENOMEM;
                 list_add_tail((struct list_head *) page, &sclp_con_pages);
         }
         INIT_LIST_HEAD(&sclp_con_outqueue);