git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
microblaze_v8: syscalls.h
[safe/jmp/linux-2.6]
/
drivers
/
parport
/
parport_cs.c
diff --git
a/drivers/parport/parport_cs.c
b/drivers/parport/parport_cs.c
index
814c525
..
0cd5fbc
100644
(file)
--- a/
drivers/parport/parport_cs.c
+++ b/
drivers/parport/parport_cs.c
@@
-112,7
+112,7
@@
static int parport_probe(struct pcmcia_device *link)
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
- link->irq.Attributes = IRQ_TYPE_
EXCLUSIVE
;
+ link->irq.Attributes = IRQ_TYPE_
DYNAMIC_SHARING
;
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
@@
-151,9
+151,10
@@
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static int parport_config_check(struct pcmcia_device *p_dev,
cistpl_cftable_entry_t *cfg,
static int parport_config_check(struct pcmcia_device *p_dev,
cistpl_cftable_entry_t *cfg,
+ cistpl_cftable_entry_t *dflt,
+ unsigned int vcc,
void *priv_data)
{
void *priv_data)
{
- cistpl_cftable_entry_t *dflt = priv_data;
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
if (epp_mode)
if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
if (epp_mode)
@@
-166,26
+167,21
@@
static int parport_config_check(struct pcmcia_device *p_dev,
p_dev->io.NumPorts2 = io->win[1].len;
}
if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
p_dev->io.NumPorts2 = io->win[1].len;
}
if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
-
goto next_entry
;
+
return -ENODEV
;
return 0;
}
return 0;
}
-
-next_entry:
- if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
- *dflt = *cfg;
return -ENODEV;
}
static int parport_config(struct pcmcia_device *link)
{
parport_info_t *info = link->priv;
return -ENODEV;
}
static int parport_config(struct pcmcia_device *link)
{
parport_info_t *info = link->priv;
- cistpl_cftable_entry_t dflt = { 0 };
struct parport *p;
int last_ret, last_fn;
DEBUG(0, "parport_config(0x%p)\n", link);
struct parport *p;
int last_ret, last_fn;
DEBUG(0, "parport_config(0x%p)\n", link);
- last_ret = pcmcia_loop_config(link, parport_config_check,
&dflt
);
+ last_ret = pcmcia_loop_config(link, parport_config_check,
NULL
);
if (last_ret) {
cs_error(link, RequestIO, last_ret);
goto failed;
if (last_ret) {
cs_error(link, RequestIO, last_ret);
goto failed;