summaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r--drivers/net/hamradio/dmascc.c4
-rw-r--r--drivers/net/hamradio/soundmodem/sm_sbc.c4
-rw-r--r--drivers/net/hamradio/soundmodem/sm_wss.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 7ed3785ff..44abcd416 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -337,7 +337,7 @@ void cleanup_module(void) {
/* Free memory */
first = info->next;
- kfree_s(info, sizeof(struct scc_info));
+ kfree(info);
}
}
@@ -545,7 +545,7 @@ int __init setup_adapter(int card_base, int type, int n) {
if (irq <= 0) {
printk("dmascc: could not find irq of %s at %#3x (irq=%d)\n",
hw[type].name, card_base, irq);
- kfree_s(info, sizeof(struct scc_info));
+ kfree(info);
return -1;
}
diff --git a/drivers/net/hamradio/soundmodem/sm_sbc.c b/drivers/net/hamradio/soundmodem/sm_sbc.c
index 772940049..85ae47588 100644
--- a/drivers/net/hamradio/soundmodem/sm_sbc.c
+++ b/drivers/net/hamradio/soundmodem/sm_sbc.c
@@ -433,13 +433,13 @@ static int sbc_open(struct net_device *dev, struct sm_state *sm)
sm->mode_rx->init(sm);
if (request_dma(dev->dma, sm->hwdrv->hw_name)) {
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
if (request_irq(dev->irq, sbc_interrupt, SA_INTERRUPT,
sm->hwdrv->hw_name, dev)) {
free_dma(dev->dma);
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
request_region(dev->base_addr, SBC_EXTENT, sm->hwdrv->hw_name);
diff --git a/drivers/net/hamradio/soundmodem/sm_wss.c b/drivers/net/hamradio/soundmodem/sm_wss.c
index 23abd970a..19840c491 100644
--- a/drivers/net/hamradio/soundmodem/sm_wss.c
+++ b/drivers/net/hamradio/soundmodem/sm_wss.c
@@ -468,13 +468,13 @@ static int wss_open(struct net_device *dev, struct sm_state *sm)
sm->mode_rx->init(sm);
if (request_dma(dev->dma, sm->hwdrv->hw_name)) {
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
if (request_irq(dev->irq, wss_interrupt, SA_INTERRUPT,
sm->hwdrv->hw_name, dev)) {
free_dma(dev->dma);
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
request_region(dev->base_addr, WSS_EXTENT, sm->hwdrv->hw_name);