From d179861430f1e019a80edfc109d0e5720ba26564 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 21 Sep 2009 15:35:42 -0400 Subject: [PATCH] --- yaml --- r: 167283 b: refs/heads/master c: ca98ee7bb4005365ad395b53229e2f6d01ca7cbd h: refs/heads/master i: 167281: 2c6d12ff74d5ccfb4b2a01d847380b30aa5a9a10 167279: 81933b2bd81d04b29dedf9712674e8f8f37c79fe v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/s526.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b94b13df67b..c52c6ccc1fe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f27014f42f0a4cb32bf45f214fa7ad7c261b1e +refs/heads/master: ca98ee7bb4005365ad395b53229e2f6d01ca7cbd diff --git a/trunk/drivers/staging/comedi/drivers/s526.c b/trunk/drivers/staging/comedi/drivers/s526.c index 736441f3c815..dbde118f2a16 100644 --- a/trunk/drivers/staging/comedi/drivers/s526.c +++ b/trunk/drivers/staging/comedi/drivers/s526.c @@ -126,10 +126,10 @@ struct counter_mode_register_t { unsigned short reserved:1; }; -union { +union cmReg { struct counter_mode_register_t reg; unsigned short value; -} cmReg; +}; #define MAX_GPCT_CONFIG_DATA 6 @@ -285,6 +285,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it) int i, n; /* short value; */ /* int subdev_channel = 0; */ + union cmReg cmReg; printk("comedi%d: s526: ", dev->minor); @@ -516,6 +517,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev, int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ int i; short value; + union cmReg cmReg; /* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel); */ @@ -741,6 +743,7 @@ static int s526_gpct_winsn(struct comedi_device *dev, { int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ short value; + union cmReg cmReg; printk("s526: GPCT_INSN_WRITE on channel %d\n", subdev_channel); cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));