diff for duplicates of <1292895677-4242-3-git-send-email-airlied@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 4bef650..bf5ec1e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ index a8ec48e..d781496 100644 @@ -3524,7 +3524,7 @@ int register_con_driver(const struct consw *csw, int first, int last) /* already registered */ - if (con_driver->con = csw) + if (con_driver->con == csw) - retval = -EINVAL; + retval = -EBUSY; } @@ -39,7 +39,7 @@ index a8ec48e..d781496 100644 + * and return success, as we may have unbound the console driver + * but not unregistered it. + */ -+ if (err = -EBUSY) ++ if (err == -EBUSY) + err = 0; if (!err) bind_con_driver(csw, first, last, deflt); diff --git a/a/content_digest b/N1/content_digest index 108a9da..9241387 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01292895677-4242-1-git-send-email-airlied@gmail.com\0" "From\0Dave Airlie <airlied@gmail.com>\0" "Subject\0[PATCH 2/3] vt: fix issue when fbcon wants to takeover a second time.\0" - "Date\0Tue, 21 Dec 2010 01:41:16 +0000\0" + "Date\0Tue, 21 Dec 2010 11:41:16 +1000\0" "To\0linux-fbdev@vger.kernel.org\0" "Cc\0dri-devel@lists.sf.net" linux-kernel@vger.kernel.org @@ -36,7 +36,7 @@ "@@ -3524,7 +3524,7 @@ int register_con_driver(const struct consw *csw, int first, int last)\n" " \n" " \t\t/* already registered */\n" - " \t\tif (con_driver->con = csw)\n" + " \t\tif (con_driver->con == csw)\n" "-\t\t\tretval = -EINVAL;\n" "+\t\t\tretval = -EBUSY;\n" " \t}\n" @@ -51,7 +51,7 @@ "+\t * and return success, as we may have unbound the console driver\n" "+\t * but not unregistered it.\n" "+\t */\n" - "+\tif (err = -EBUSY)\n" + "+\tif (err == -EBUSY)\n" "+\t\terr = 0;\n" " \tif (!err)\n" " \t\tbind_con_driver(csw, first, last, deflt);\n" @@ -59,4 +59,4 @@ "-- \n" 1.7.1 -a8819ec9bb55f8a5b9edc65a1b2641f4aec3c40f7d284e890996de5b72773a62 +919821816a50d13662ab62ce7e9e60d51f271f7ccaee1168dbc9eaf9786104de
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.