| Message ID | 1389298893-4043-1-git-send-email-cheiny@synaptics.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 09, 2014 at 12:21:33PM -0800, Christopher Heiny wrote: > Use a sensible format string for the date of manufacture formatting. > > Signed-off-by: Christopher Heiny <cheiny@synaptics.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Applied, thank you. > > --- > > drivers/input/rmi4/rmi_f01.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c > index 1cb11ea..9e6a578 100644 > --- a/drivers/input/rmi4/rmi_f01.c > +++ b/drivers/input/rmi4/rmi_f01.c > @@ -50,7 +50,7 @@ struct f01_basic_properties { > bool has_lts; > bool has_adjustable_doze; > bool has_adjustable_doze_holdoff; > - char dom[9]; /* YYYYMMDD + '\0' */ > + char dom[11]; /* YYYY/MM/DD + '\0' */ > u8 product_id[RMI_PRODUCT_ID_LENGTH + 1]; > u16 productinfo; > }; > @@ -190,8 +190,7 @@ static int rmi_f01_read_properties(struct rmi_device *rmi_dev, > props->has_adjustable_doze_holdoff = > basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF; > > - snprintf(props->dom, sizeof(props->dom), > - "20%02x%02x%02x", > + snprintf(props->dom, sizeof(props->dom), "20%02d/%02d/%02d", > basic_query[5] & RMI_F01_QRY5_YEAR_MASK, > basic_query[6] & RMI_F01_QRY6_MONTH_MASK, > basic_query[7] & RMI_F01_QRY7_DAY_MASK);
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index 1cb11ea..9e6a578 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c @@ -50,7 +50,7 @@ struct f01_basic_properties { bool has_lts; bool has_adjustable_doze; bool has_adjustable_doze_holdoff; - char dom[9]; /* YYYYMMDD + '\0' */ + char dom[11]; /* YYYY/MM/DD + '\0' */ u8 product_id[RMI_PRODUCT_ID_LENGTH + 1]; u16 productinfo; }; @@ -190,8 +190,7 @@ static int rmi_f01_read_properties(struct rmi_device *rmi_dev, props->has_adjustable_doze_holdoff = basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF; - snprintf(props->dom, sizeof(props->dom), - "20%02x%02x%02x", + snprintf(props->dom, sizeof(props->dom), "20%02d/%02d/%02d", basic_query[5] & RMI_F01_QRY5_YEAR_MASK, basic_query[6] & RMI_F01_QRY6_MONTH_MASK, basic_query[7] & RMI_F01_QRY7_DAY_MASK);
Use a sensible format string for the date of manufacture formatting. Signed-off-by: Christopher Heiny <cheiny@synaptics.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- drivers/input/rmi4/rmi_f01.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html