From a7de91e611e2e386119d17eafe011d62a02e9476 Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Sat, 19 Nov 2011 16:02:45 +0100 Subject: [PATCH] --- yaml --- r: 282815 b: refs/heads/master c: dbc26d98f8b4a3d1d2f25d997a0a0aba4ea46add h: refs/heads/master i: 282813: 1add9b40c2e618ee67517d926dd92bc4e91de402 282811: 2d0d6eb17fc36d65f4a7e0dd327d15cd7caa6282 282807: f43c1548ebd22cc00bf88e9131cdd07b33a8fe04 282799: 767c14f5b8643e5c7a2d3371eafb03fcc0c88fc1 282783: 58b0d0f8e24ebc6a201de578f82d0edf76112d65 282751: 3c3a4737958c89e26a6683580ef699ba274b2eb1 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/docg3.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 321c9e6d59b5..833fa89e2ca2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84a930581ef45e81cff0450b19ce5a70f24d50bb +refs/heads/master: dbc26d98f8b4a3d1d2f25d997a0a0aba4ea46add diff --git a/trunk/drivers/mtd/devices/docg3.c b/trunk/drivers/mtd/devices/docg3.c index 8942a751342e..5834e6e65d1c 100644 --- a/trunk/drivers/mtd/devices/docg3.c +++ b/trunk/drivers/mtd/devices/docg3.c @@ -852,13 +852,15 @@ static int dbg_protection_show(struct seq_file *s, void *p) { struct docg3 *docg3 = (struct docg3 *)s->private; int pos = 0; - int protect = doc_register_readb(docg3, DOC_PROTECTION); - int dps0 = doc_register_readb(docg3, DOC_DPS0_STATUS); - int dps0_low = doc_register_readb(docg3, DOC_DPS0_ADDRLOW); - int dps0_high = doc_register_readb(docg3, DOC_DPS0_ADDRHIGH); - int dps1 = doc_register_readb(docg3, DOC_DPS1_STATUS); - int dps1_low = doc_register_readb(docg3, DOC_DPS1_ADDRLOW); - int dps1_high = doc_register_readb(docg3, DOC_DPS1_ADDRHIGH); + int protect, dps0, dps0_low, dps0_high, dps1, dps1_low, dps1_high; + + protect = doc_register_readb(docg3, DOC_PROTECTION); + dps0 = doc_register_readb(docg3, DOC_DPS0_STATUS); + dps0_low = doc_register_readw(docg3, DOC_DPS0_ADDRLOW); + dps0_high = doc_register_readw(docg3, DOC_DPS0_ADDRHIGH); + dps1 = doc_register_readb(docg3, DOC_DPS1_STATUS); + dps1_low = doc_register_readw(docg3, DOC_DPS1_ADDRLOW); + dps1_high = doc_register_readw(docg3, DOC_DPS1_ADDRHIGH); pos += seq_printf(s, "Protection = 0x%02x (", protect);