File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -2240,6 +2240,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
2240
2240
conf1_write (lanai );
2241
2241
#endif
2242
2242
iounmap (lanai -> base );
2243
+ lanai -> base = NULL ;
2243
2244
error_pci :
2244
2245
pci_disable_device (lanai -> pci );
2245
2246
error :
@@ -2252,6 +2253,8 @@ static int lanai_dev_open(struct atm_dev *atmdev)
2252
2253
static void lanai_dev_close (struct atm_dev * atmdev )
2253
2254
{
2254
2255
struct lanai_dev * lanai = (struct lanai_dev * ) atmdev -> dev_data ;
2256
+ if (lanai -> base == NULL )
2257
+ return ;
2255
2258
printk (KERN_INFO DEV_LABEL "(itf %d): shutting down interface\n" ,
2256
2259
lanai -> number );
2257
2260
lanai_timed_poll_stop (lanai );
@@ -2561,7 +2564,7 @@ static int lanai_init_one(struct pci_dev *pci,
2561
2564
struct atm_dev * atmdev ;
2562
2565
int result ;
2563
2566
2564
- lanai = kmalloc (sizeof (* lanai ), GFP_KERNEL );
2567
+ lanai = kzalloc (sizeof (* lanai ), GFP_KERNEL );
2565
2568
if (lanai == NULL ) {
2566
2569
printk (KERN_ERR DEV_LABEL
2567
2570
": couldn't allocate dev_data structure!\n" );
You can’t perform that action at this time.
0 commit comments