Pull delete-sigdelayed into release branch

[powerpc.git] / drivers / s390 / char / raw3270.c

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index d669464..1026f2b 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -183,8 +183,7 @@ raw3270_request_alloc_bootmem(size_t size)
 void
 raw3270_request_free (struct raw3270_request *rq)
 {
-       if (rq->buffer)
-               kfree(rq->buffer);
+       kfree(rq->buffer);
        kfree(rq);
 }
 
@@ -1180,12 +1179,12 @@ raw3270_create_attributes(struct raw3270 *rp)
        //FIXME: check return code
        sysfs_create_group(&rp->cdev->dev.kobj, &raw3270_attr_group);
        rp->clttydev =
-               class_device_create(class3270,
+               class_device_create(class3270, NULL,
                                    MKDEV(IBM_TTY3270_MAJOR, rp->minor),
                                    &rp->cdev->dev, "tty%s",
                                    rp->cdev->dev.bus_id);
        rp->cltubdev =
-               class_device_create(class3270,
+               class_device_create(class3270, NULL,
                                    MKDEV(IBM_FS3270_MAJOR, rp->minor),
                                    &rp->cdev->dev, "tub%s",
                                    rp->cdev->dev.bus_id);