X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-session-device.c;h=592bcf2d9f958fcf88f8ef59e37cd67cfd229330;hp=b2ef8ccc999e6f01925697af22b563878ee76c0b;hb=d1107170f9e0fa2cb6e8d18586a003f0d96abfc3;hpb=5fd38859b30b95008e483109578c7fef2b5072f3;ds=sidebyside diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index b2ef8ccc9..592bcf2d9 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -162,7 +162,7 @@ static int session_device_open(SessionDevice *sd, bool active) { * state. */ r = sd_drmsetmaster(fd); if (r < 0) { - close(fd); + close_nointr(fd); return r; } } else { @@ -209,7 +209,7 @@ static int session_device_start(SessionDevice *sd) { r = session_device_open(sd, true); if (r < 0) return r; - close_nointr_nofail(sd->fd); + close_nointr(sd->fd); sd->fd = r; break; case DEVICE_TYPE_UNKNOWN: @@ -407,7 +407,7 @@ void session_device_free(SessionDevice *sd) { session_device_stop(sd); session_device_notify(sd, SESSION_DEVICE_RELEASE); - close_nointr_nofail(sd->fd); + close_nointr(sd->fd); LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);