Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141560
b: refs/heads/master
c: d2755d5
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 7fb86ee commit 39a1189
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: bfae362ab6a9737e67a07ff82632a16181bb2d3c
refs/heads/master: d2755d518620bfa3ab6d25aed4048a2d35868e3d
18 changes: 9 additions & 9 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,12 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *);

static dev_info_t dev_info = "cb_das16_cs";

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

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

DEBUG(0, "das16cs_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 All @@ -738,17 +738,17 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
DEBUG(0, "das16cs_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;
das16cs_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);
} /* das16cs_pcmcia_detach */

static void das16cs_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 @@ -903,7 +903,7 @@ static void das16cs_pcmcia_release(struct pcmcia_device *link)

static int das16cs_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 @@ -913,7 +913,7 @@ static int das16cs_pcmcia_suspend(struct pcmcia_device *link)

static int das16cs_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 39a1189

Please sign in to comment.