diff for duplicates of <201008112218.11535.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 858d0d9..9d9032d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,12 +65,12 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + +static bool s3fb_ddc_needs_mmio(int chip) +{ -+ return !(chip = CHIP_356_VIRGE_GX2 || -+ chip = CHIP_357_VIRGE_GX2P || -+ chip = CHIP_359_VIRGE_GX2P || -+ chip = CHIP_360_TRIO3D_1X || -+ chip = CHIP_362_TRIO3D_2X || -+ chip = CHIP_368_TRIO3D_2X); ++ return !(chip == CHIP_356_VIRGE_GX2 || ++ chip == CHIP_357_VIRGE_GX2P || ++ chip == CHIP_359_VIRGE_GX2P || ++ chip == CHIP_360_TRIO3D_1X || ++ chip == CHIP_362_TRIO3D_2X || ++ chip == CHIP_368_TRIO3D_2X); +} + +static u8 s3fb_ddc_read(struct s3fb_info *par) @@ -183,13 +183,13 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + info->fix.smem_start + MMIO_OFFSET); + } + if (!s3fb_ddc_needs_mmio(par->chip) || par->mmio) -+ if (s3fb_setup_ddc_bus(info) = 0) ++ if (s3fb_setup_ddc_bus(info) == 0) + par->ddc_registered = true; +#endif + /* Prepare startup mode */ rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8); - if (! ((rc = 1) || (rc = 2))) { + if (! ((rc == 1) || (rc == 2))) { @@ -1064,6 +1204,12 @@ fb_dealloc_cmap(&info->cmap); err_alloc_cmap: diff --git a/a/content_digest b/N1/content_digest index 83279ce..b99d420 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH] s3fb: add DDC support\0" - "Date\0Wed, 11 Aug 2010 20:18:09 +0000\0" + "Date\0Wed, 11 Aug 2010 22:18:09 +0200\0" "To\0Ondrej Zajicek <santiago@crfreenet.org>\0" "Cc\0linux-fbdev@vger.kernel.org" " Kernel development list <linux-kernel@vger.kernel.org>\0" @@ -73,12 +73,12 @@ "+\n" "+static bool s3fb_ddc_needs_mmio(int chip)\n" "+{\n" - "+\treturn !(chip = CHIP_356_VIRGE_GX2 ||\n" - "+\t\t chip = CHIP_357_VIRGE_GX2P ||\n" - "+\t\t chip = CHIP_359_VIRGE_GX2P ||\n" - "+\t\t chip = CHIP_360_TRIO3D_1X ||\n" - "+\t\t chip = CHIP_362_TRIO3D_2X ||\n" - "+\t\t chip = CHIP_368_TRIO3D_2X);\n" + "+\treturn !(chip == CHIP_356_VIRGE_GX2 ||\n" + "+\t\t chip == CHIP_357_VIRGE_GX2P ||\n" + "+\t\t chip == CHIP_359_VIRGE_GX2P ||\n" + "+\t\t chip == CHIP_360_TRIO3D_1X ||\n" + "+\t\t chip == CHIP_362_TRIO3D_2X ||\n" + "+\t\t chip == CHIP_368_TRIO3D_2X);\n" "+}\n" "+\n" "+static u8 s3fb_ddc_read(struct s3fb_info *par)\n" @@ -191,13 +191,13 @@ "+\t\t\t\tinfo->fix.smem_start + MMIO_OFFSET);\n" "+\t}\n" "+\tif (!s3fb_ddc_needs_mmio(par->chip) || par->mmio)\n" - "+\t\tif (s3fb_setup_ddc_bus(info) = 0)\n" + "+\t\tif (s3fb_setup_ddc_bus(info) == 0)\n" "+\t\t\tpar->ddc_registered = true;\n" "+#endif\n" "+\n" " \t/* Prepare startup mode */\n" " \trc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);\n" - " \tif (! ((rc = 1) || (rc = 2))) {\n" + " \tif (! ((rc == 1) || (rc == 2))) {\n" "@@ -1064,6 +1204,12 @@\n" " \tfb_dealloc_cmap(&info->cmap);\n" " err_alloc_cmap:\n" @@ -230,4 +230,4 @@ "-- \n" Ondrej Zary -20c16b1f21332a09160db53c8a0804628829986f3da5e34e89dd5d250cf29983 +0ee6f827c1f9b2ba41aaad481f138ca4f25fcceb9288ad6d43f38ad090d97dcd
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.