Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
pcmcia
/
electra_cf.c
diff --git
a/kernel/drivers/pcmcia/electra_cf.c
b/kernel/drivers/pcmcia/electra_cf.c
index
7f9950d
..
61cf61a
100644
(file)
--- a/
kernel/drivers/pcmcia/electra_cf.c
+++ b/
kernel/drivers/pcmcia/electra_cf.c
@@
-48,14
+48,14
@@
struct electra_cf_socket {
struct platform_device *ofdev;
unsigned long mem_phys;
struct platform_device *ofdev;
unsigned long mem_phys;
- void __iomem
*
mem_base;
+ void __iomem
*
mem_base;
unsigned long mem_size;
unsigned long mem_size;
- void __iomem
*
io_virt;
+ void __iomem
*
io_virt;
unsigned int io_base;
unsigned int io_size;
u_int irq;
struct resource iomem;
unsigned int io_base;
unsigned int io_size;
u_int irq;
struct resource iomem;
- void __iomem
*
gpio_base;
+ void __iomem
*
gpio_base;
int gpio_detect;
int gpio_vsense;
int gpio_3v;
int gpio_detect;
int gpio_vsense;
int gpio_3v;
@@
-202,7
+202,7
@@
static int electra_cf_probe(struct platform_device *ofdev)
if (err)
return -EINVAL;
if (err)
return -EINVAL;
- cf = kzalloc(sizeof
*cf
, GFP_KERNEL);
+ cf = kzalloc(sizeof
(*cf)
, GFP_KERNEL);
if (!cf)
return -ENOMEM;
if (!cf)
return -ENOMEM;
@@
-216,8
+216,10
@@
static int electra_cf_probe(struct platform_device *ofdev)
cf->io_size = PAGE_ALIGN(resource_size(&io));
area = __get_vm_area(cf->io_size, 0, PHB_IO_BASE, PHB_IO_END);
cf->io_size = PAGE_ALIGN(resource_size(&io));
area = __get_vm_area(cf->io_size, 0, PHB_IO_BASE, PHB_IO_END);
- if (area == NULL)
- return -ENOMEM;
+ if (area == NULL) {
+ status = -ENOMEM;
+ goto fail1;
+ }
cf->io_virt = (void __iomem *)(area->addr);
cf->io_virt = (void __iomem *)(area->addr);
@@
-320,7
+322,8
@@
fail1:
iounmap(cf->mem_base);
if (cf->gpio_base)
iounmap(cf->gpio_base);
iounmap(cf->mem_base);
if (cf->gpio_base)
iounmap(cf->gpio_base);
- device_init_wakeup(&ofdev->dev, 0);
+ if (area)
+ device_init_wakeup(&ofdev->dev, 0);
kfree(cf);
return status;
kfree(cf);
return status;
@@
-369,5
+372,5
@@
static struct platform_driver electra_cf_driver = {
module_platform_driver(electra_cf_driver);
MODULE_LICENSE("GPL");
module_platform_driver(electra_cf_driver);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR
("Olof Johansson <olof@lixom.net>");
+MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
MODULE_DESCRIPTION("PA Semi Electra CF driver");
MODULE_DESCRIPTION("PA Semi Electra CF driver");