Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141577
b: refs/heads/master
c: d896146
h: refs/heads/master
i:
  141575: 4efb175
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 671ed5f commit 2724507
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: b36536816e1f34b2be1da9edb78e8b55bc414081
refs/heads/master: d8961467e60d42c1997fdf783fee4802c9fea8cc
18 changes: 9 additions & 9 deletions trunk/drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ static void das08_pcmcia_detach(struct pcmcia_device *);

static const dev_info_t dev_info = "pcm-das08";

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 @@ -177,12 +177,12 @@ typedef struct local_info_t {

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

DEBUG(0, "das08_pcmcia_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 @@ -225,11 +225,11 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
DEBUG(0, "das08_pcmcia_detach(0x%p)\n", link);

if (link->dev_node) {
((local_info_t *) link->priv)->stop = 1;
((struct local_info_t *) link->priv)->stop = 1;
das08_pcmcia_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 @@ -245,7 +245,7 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)

static void das08_pcmcia_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_fn, last_ret;
Expand Down Expand Up @@ -417,7 +417,7 @@ static void das08_pcmcia_release(struct pcmcia_device *link)

static int das08_pcmcia_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 @@ -426,7 +426,7 @@ static int das08_pcmcia_suspend(struct pcmcia_device *link)

static int das08_pcmcia_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 2724507

Please sign in to comment.