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

Commit 696c75c1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 829ae5be: Merge "Remove a pre-uapi hack from nandread." 

* commit '829ae5be':
  Remove a pre-uapi hack from nandread.
parents d90b11b6 829ae5be

toolbox/nandread.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -177,11 +177,7 @@ int nandread_main(int argc, char **argv) 




    if (rawmode) {

    if (rawmode) {

        rawmode = mtdinfo.oobsize;

        rawmode = mtdinfo.oobsize;

#if !defined(MTD_STUPID_LOCK) /* using uapi kernel headers */

        ret = ioctl(fd, MTDFILEMODE, MTD_FILE_MODE_RAW);

        ret = ioctl(fd, MTDFILEMODE, MTD_FILE_MODE_RAW);

#else /* still using old kernel headers */

        ret = ioctl(fd, MTDFILEMODE, MTD_MODE_RAW);

#endif

        if (ret) {

        if (ret) {

            fprintf(stderr, "failed set raw mode for %s, %s\n",

            fprintf(stderr, "failed set raw mode for %s, %s\n",

                    devname, strerror(errno));

                    devname, strerror(errno));