Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141568
b: refs/heads/master
c: ecce633
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 314dd18 commit 42d4a97
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cfee7b998b2407f5ee53d76bae9e2805baf6dbb4
refs/heads/master: ecce6332ef5f88ba0ac8e9e7511538431952dda7
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/comedi_rt_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static struct comedi_driver driver_timer = {

COMEDI_INITCLEANUP(driver_timer);

typedef struct {
struct timer_private {
comedi_t *device; // device we are emulating commands for
int subd; // subdevice we are emulating commands for
RT_TASK *rt_task; // rt task that starts scans
Expand All @@ -159,8 +159,8 @@ typedef struct {
volatile int rt_task_active; // indicates rt_task is servicing a struct comedi_cmd
volatile int scan_task_active; // indicates scan_task is servicing a struct comedi_cmd
unsigned timer_running:1;
} timer_private;
#define devpriv ((timer_private *)dev->private)
};
#define devpriv ((struct timer_private *)dev->private)

static int timer_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
{
Expand Down Expand Up @@ -623,7 +623,7 @@ static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it

if ((ret = alloc_subdevices(dev, 1)) < 0)
return ret;
if ((ret = alloc_private(dev, sizeof(timer_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct timer_private))) < 0)
return ret;

sprintf(path, "/dev/comedi%d", it->options[0]);
Expand Down

0 comments on commit 42d4a97

Please sign in to comment.