Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141693
b: refs/heads/master
c: 30570f0
h: refs/heads/master
i:
  141691: c9942eb
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent d1550f7 commit a51aacc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: 4cab3740734fb8582fa68f899105790c05935b55
refs/heads/master: 30570f0dee2b0e3ede09e08eb5dfd514317a7587
18 changes: 9 additions & 9 deletions trunk/drivers/staging/comedi/drivers/ni_daq_700.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,12 @@ static void dio700_cs_detach(struct pcmcia_device *);

static const dev_info_t dev_info = "ni_daq_700";

typedef struct local_info_t {
struct local_info_t {
struct pcmcia_device *link;
dev_node_t node;
int stop;
struct bus_operations *bus;
} local_info_t;
};

/*======================================================================
Expand All @@ -500,14 +500,14 @@ typedef struct local_info_t {

static int dio700_cs_attach(struct pcmcia_device *link)
{
local_info_t *local;
struct local_info_t *local;

printk(KERN_INFO "ni_daq_700: cs-attach\n");

DEBUG(0, "dio700_cs_attach()\n");

/* Allocate space for private device-specific data */
local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->link = link;
Expand Down Expand Up @@ -552,11 +552,11 @@ static void dio700_cs_detach(struct pcmcia_device *link)
DEBUG(0, "dio700_cs_detach(0x%p)\n", link);

if (link->dev_node) {
((local_info_t *) link->priv)->stop = 1;
((struct local_info_t *) link->priv)->stop = 1;
dio700_release(link);
}

/* This points to the parent local_info_t struct */
/* This points to the parent struct local_info_t struct */
if (link->priv)
kfree(link->priv);

Expand All @@ -572,7 +572,7 @@ static void dio700_cs_detach(struct pcmcia_device *link)

static void dio700_config(struct pcmcia_device *link)
{
local_info_t *dev = link->priv;
struct local_info_t *dev = link->priv;
tuple_t tuple;
cisparse_t parse;
int last_ret;
Expand Down Expand Up @@ -772,7 +772,7 @@ static void dio700_release(struct pcmcia_device *link)

static int dio700_cs_suspend(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
struct local_info_t *local = link->priv;

/* Mark the device as stopped, to block IO until later */
local->stop = 1;
Expand All @@ -781,7 +781,7 @@ static int dio700_cs_suspend(struct pcmcia_device *link)

static int dio700_cs_resume(struct pcmcia_device *link)
{
local_info_t *local = link->priv;
struct local_info_t *local = link->priv;

local->stop = 0;
return 0;
Expand Down

0 comments on commit a51aacc

Please sign in to comment.