projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pcmcia: add pcmcia_disable_device
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
pcmcia
/
nsp_cs.c
diff --git
a/drivers/scsi/pcmcia/nsp_cs.c
b/drivers/scsi/pcmcia/nsp_cs.c
index 9e3ab3fd53555528471ef7d489c877c001ffab58..dd383c538d98f0a637bd07bacbc37c2edc6dbc3a 100644
(file)
--- a/
drivers/scsi/pcmcia/nsp_cs.c
+++ b/
drivers/scsi/pcmcia/nsp_cs.c
@@
-1974,16
+1974,9
@@
static void nsp_cs_release(dev_link_t *link)
if (data != NULL) {
iounmap((void *)(data->MmioAddress));
}
if (data != NULL) {
iounmap((void *)(data->MmioAddress));
}
- pcmcia_release_window(link->win);
}
}
- pcmcia_release_configuration(link->handle);
- if (link->io.NumPorts1) {
- pcmcia_release_io(link->handle, &link->io);
- }
- if (link->irq.AssignedIRQ) {
- pcmcia_release_irq(link->handle, &link->irq);
- }
- link->state &= ~DEV_CONFIG;
+ pcmcia_disable_device(link->handle);
+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
if (info->host != NULL) {
scsi_host_put(info->host);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
if (info->host != NULL) {
scsi_host_put(info->host);