Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05858807 authored by Zijun Zhao's avatar Zijun Zhao Committed by Android (Google) Code Review
Browse files

Revert "Fix the error and make the argument nonnull" 

This reverts commit 8ee5768b.

Reason for revert: this argument will be corrected as null_unspecified

Change-Id: Ia6ab97657737f77125e974c45d0a2d1a6342dadc
parent 8ee5768b

media/mtp/MtpFfsHandle.cpp

+2 −4
Original line number Diff line number Diff line
@@ -362,12 +362,10 @@ int MtpFfsHandle::waitEvents(struct io_buffer *buf, int min_events, struct io_ev 


void MtpFfsHandle::cancelTransaction() {

    // Device cancels by stalling both bulk endpoints.

    void *buf = malloc(sizeof(char));

    if (::read(mBulkIn, buf, 0) != -1 || errno != EBADMSG)

    if (::read(mBulkIn, nullptr, 0) != -1 || errno != EBADMSG)

        PLOG(ERROR) << "Mtp stall failed on bulk in";

    if (::write(mBulkOut, buf, 0) != -1 || errno != EBADMSG)

    if (::write(mBulkOut, nullptr, 0) != -1 || errno != EBADMSG)

        PLOG(ERROR) << "Mtp stall failed on bulk out";

    free(buf);

    mCanceled = true;

    errno = ECANCELED;

}