sb16: request_region failure ignored in snd_sb16_isa_probe1()
PATCH 1/1 sb16: request_region failure ignored in snd_sb16_isa_probe1()
request_region() may fail. clean up if it does,
also a release region later on was missing.
Signed-off-by Roel Kluin <[email protected]>
---
Found with sed: http://kernelnewbies.org/roelkluin
build, sparse and checkpatch tested.
sound/isa/sb/sb16.c +6 -0
@@ -502,6 +502,11 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) fm_port[dev] = port[dev];/* block the 0x388 port to avoid PnP conflicts */ acard->fm_res =request_region (0x388 ,4 ,"SoundBlaster FM" ); +if (acard->fm_res ==NULL ) { +snd_card_free (card); +return -ENOMEM ; + } +#ifdef SNDRV_SBAWE_EMU8000 /* non-PnP AWE port address is hardwired with base port address */ awe_port[dev] = port[dev] +0x400 ;
@@ -509,6 +514,7 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)snd_card_set_dev (card, pdev);if ((err =snd_sb16_probe (card, dev)) <0 ) { +release_region (0x388 ,4 );snd_card_free (card);return err; }
At Mon, 21 Sep 2009 12:03:47 +0200,
Quoted 9 lines · Roel Kluin
request_region()may fail. clean up if it does,
also a release region later on was missing.Signed-off-by Roel Kluin <[email protected]>---
Found with sed: http://kernelnewbies.org/roelkluinbuild, sparse and checkpatch tested.
Thanks for the patch. But, it looks incorrect.
The resource acard->fm_res is released properly in the destructor callback (snd_sb16_free()).
Also, acard->fm_res == NULL is no critical error and can be accepted as is.
Takashi
Quoted 25 lines
sound/isa/sb/sb16.c +6
-0@@ -502,6 +502,11 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) fm_port[dev] = port[dev];/* block the 0x388 port to avoid PnP conflicts */ acard->fm_res =request_region (0x388 ,4 ,"SoundBlaster FM" ); +if (acard->fm_res ==NULL ) { +snd_card_free (card); +return -ENOMEM ; + } +#ifdef SNDRV_SBAWE_EMU8000 /* non-PnP AWE port address is hardwired with base port address */ awe_port[dev] = port[dev] +0x400 ;@@ -509,6 +514,7 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)snd_card_set_dev (card, pdev);if ((err =snd_sb16_probe (card, dev)) <0 ) { +release_region (0x388 ,4 );snd_card_free (card);return err; }