Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / con3215.c

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index f11a67fda40e55a4a009ff04f16a6217b8fa76c1..75419cf9d35351b0b2c2a3cb1c3296046d1d7e51 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -727,8 +727,7 @@ raw3215_remove (struct ccw_device *cdev)
        raw = cdev->dev.driver_data;
        if (raw) {
                cdev->dev.driver_data = NULL;
-               if (raw->buffer)
-                       kfree(raw->buffer);
+               kfree(raw->buffer);
                kfree(raw);
        }
 }