diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-08-12 15:14:03 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-08-12 15:14:03 +0200 |
| commit | 181ae8844578d0a80f188c1d195fd6bb91bcec81 (patch) | |
| tree | bd6ebfb8eb390ea6927603ca4e33c263c82b2cd7 /drivers/s390/char/con3215.c | |
| parent | 8f1c748b9a7751ee1297b4880788a09f7c802eb4 (diff) | |
| parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
| download | linux-181ae8844578d0a80f188c1d195fd6bb91bcec81.tar.bz2 | |
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Backport requested for omap dma mask fix. I'm not sure it still
requires it, but just in case. :)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/s390/char/con3215.c')
| -rw-r--r-- | drivers/s390/char/con3215.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 8c9d412b6d33..e7cf0a1d4f71 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -398,6 +398,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm, } if (dstat == 0x08) break; + /* else, fall through */ case 0x04: /* Device end interrupt. */ if ((raw = req->info) == NULL) |