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 @@ -2234,6 +2234,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
2234
2234
conf1_write (lanai );
2235
2235
#endif
2236
2236
iounmap (lanai -> base );
2237
+ lanai -> base = NULL ;
2237
2238
error_pci :
2238
2239
pci_disable_device (lanai -> pci );
2239
2240
error :
@@ -2246,6 +2247,8 @@ static int lanai_dev_open(struct atm_dev *atmdev)
2246
2247
static void lanai_dev_close (struct atm_dev * atmdev )
2247
2248
{
2248
2249
struct lanai_dev * lanai = (struct lanai_dev * ) atmdev -> dev_data ;
2250
+ if (lanai -> base == NULL )
2251
+ return ;
2249
2252
printk (KERN_INFO DEV_LABEL "(itf %d): shutting down interface\n" ,
2250
2253
lanai -> number );
2251
2254
lanai_timed_poll_stop (lanai );
@@ -2555,7 +2558,7 @@ static int lanai_init_one(struct pci_dev *pci,
2555
2558
struct atm_dev * atmdev ;
2556
2559
int result ;
2557
2560
2558
- lanai = kmalloc (sizeof (* lanai ), GFP_KERNEL );
2561
+ lanai = kzalloc (sizeof (* lanai ), GFP_KERNEL );
2559
2562
if (lanai == NULL ) {
2560
2563
printk (KERN_ERR DEV_LABEL
2561
2564
": couldn't allocate dev_data structure!\n" );
You can’t perform that action at this time.
0 commit comments