diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/net/hamradio/soundmodem | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/net/hamradio/soundmodem')
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm_sbc.c | 4 | ||||
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm_wss.c | 4 |
2 files changed, 4 insertions, 4 deletions
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); |