diff for duplicates of <20150207155933.4f1d0998@maestro.intranet> diff --git a/a/1.txt b/N1/1.txt index acb2f42..8d3d8fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -183,7 +183,7 @@ would you propose to solve this? > > - pwm_put(par->pwm); > > - return 0; > > -} -> > + if (par->device_info->device_id = DEVID_SSD1307) { +> > + if (par->device_info->device_id == DEVID_SSD1307) { > > + par->pwm = pwm_get(&par->client->dev, NULL); > > + if (IS_ERR(par->pwm)) { > > + dev_err(&par->client->dev, "Could not get @@ -315,7 +315,7 @@ would you propose to solve this? > > if (ret < 0) > > return ret; > > -> > + if (par->device_info->device_id = DEVID_SSD1306) { +> > + if (par->device_info->device_id == DEVID_SSD1306) { > > + /* Turn on the DC-DC Charge Pump */ > > + ret = ssd1307fb_write_cmd(par->client, > > SSD1307FB_CHARGE_PUMP); @@ -465,7 +465,8 @@ would you propose to solve this? > > + > > + if (of_property_read_u32(node, "solomon,dclk-frq", > > &par->dclk_frq)) -> > + par->dclk_frq > > par->device_info->default_dclk_frq; + +> > + par->dclk_frq = +> > par->device_info->default_dclk_frq; + > > if (!vmem) { > > dev_err(&client->dev, "Couldn't allocate graphical > > memory.\n"); ret = -ENOMEM; @@ -490,7 +491,7 @@ would you propose to solve this? > > panel_init_error: > > - if (par->ops->remove) > > - par->ops->remove(par); -> > + if (par->device_info->device_id = DEVID_SSD1307) { +> > + if (par->device_info->device_id == DEVID_SSD1307) { > > + pwm_disable(par->pwm); > > + pwm_put(par->pwm); > > + }; @@ -503,7 +504,7 @@ would you propose to solve this? > > unregister_framebuffer(info); > > - if (par->ops->remove) > > - par->ops->remove(par); -> > + if (par->device_info->device_id = DEVID_SSD1307) { +> > + if (par->device_info->device_id == DEVID_SSD1307) { > > + pwm_disable(par->pwm); > > + pwm_put(par->pwm); > > + }; diff --git a/a/content_digest b/N1/content_digest index 3e07c8d..ace2382 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020150207104225.GM2079@lukather\0" "From\0Thomas Niederpr\303\274m <niederp@physik.uni-kl.de>\0" "Subject\0Re: [PATCH 2/8] fbdev: ssd1307fb: Unify init code and make controller configurable from device tree\0" - "Date\0Sat, 07 Feb 2015 14:59:33 +0000\0" + "Date\0Sat, 7 Feb 2015 15:59:33 +0100\0" "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" "Cc\0linux-fbdev@vger.kernel.org" plagnioj@jcrosoft.com @@ -196,7 +196,7 @@ "> > -\tpwm_put(par->pwm);\n" "> > -\treturn 0;\n" "> > -}\n" - "> > +\tif (par->device_info->device_id = DEVID_SSD1307) {\n" + "> > +\tif (par->device_info->device_id == DEVID_SSD1307) {\n" "> > +\t\tpar->pwm = pwm_get(&par->client->dev, NULL);\n" "> > +\t\tif (IS_ERR(par->pwm)) {\n" "> > +\t\t\tdev_err(&par->client->dev, \"Could not get\n" @@ -328,7 +328,7 @@ "> > \tif (ret < 0)\n" "> > \t\treturn ret;\n" "> > \n" - "> > +\tif (par->device_info->device_id = DEVID_SSD1306) {\n" + "> > +\tif (par->device_info->device_id == DEVID_SSD1306) {\n" "> > +\t\t/* Turn on the DC-DC Charge Pump */\n" "> > +\t\tret = ssd1307fb_write_cmd(par->client,\n" "> > SSD1307FB_CHARGE_PUMP);\n" @@ -478,7 +478,8 @@ "> > +\n" "> > +\tif (of_property_read_u32(node, \"solomon,dclk-frq\",\n" "> > &par->dclk_frq))\n" - "> > +\t\tpar->dclk_frq > > par->device_info->default_dclk_frq; +\n" + "> > +\t\tpar->dclk_frq =\n" + "> > par->device_info->default_dclk_frq; +\n" "> > \tif (!vmem) {\n" "> > \t\tdev_err(&client->dev, \"Couldn't allocate graphical\n" "> > memory.\\n\"); ret = -ENOMEM;\n" @@ -503,7 +504,7 @@ "> > panel_init_error:\n" "> > -\tif (par->ops->remove)\n" "> > -\t\tpar->ops->remove(par);\n" - "> > +\tif (par->device_info->device_id = DEVID_SSD1307) {\n" + "> > +\tif (par->device_info->device_id == DEVID_SSD1307) {\n" "> > +\t\tpwm_disable(par->pwm);\n" "> > +\t\tpwm_put(par->pwm);\n" "> > +\t};\n" @@ -516,7 +517,7 @@ "> > \tunregister_framebuffer(info);\n" "> > -\tif (par->ops->remove)\n" "> > -\t\tpar->ops->remove(par);\n" - "> > +\tif (par->device_info->device_id = DEVID_SSD1307) {\n" + "> > +\tif (par->device_info->device_id == DEVID_SSD1307) {\n" "> > +\t\tpwm_disable(par->pwm);\n" "> > +\t\tpwm_put(par->pwm);\n" "> > +\t};\n" @@ -531,4 +532,4 @@ "> > \n" > -326e83c46f80478d9f6aa9d7e1d1310ffd7930d001f4a07f9662650c2ca37b9a +729d0c87aeb692a14f55a0e3752edca00d6a534048108e078c15b96ea45e65a3
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.