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 @@ -2233,6 +2233,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
22332233 conf1_write (lanai );
22342234#endif
22352235 iounmap (lanai -> base );
2236+ lanai -> base = NULL ;
22362237 error_pci :
22372238 pci_disable_device (lanai -> pci );
22382239 error :
@@ -2245,6 +2246,8 @@ static int lanai_dev_open(struct atm_dev *atmdev)
22452246static void lanai_dev_close (struct atm_dev * atmdev )
22462247{
22472248 struct lanai_dev * lanai = (struct lanai_dev * ) atmdev -> dev_data ;
2249+ if (lanai -> base == NULL )
2250+ return ;
22482251 printk (KERN_INFO DEV_LABEL "(itf %d): shutting down interface\n" ,
22492252 lanai -> number );
22502253 lanai_timed_poll_stop (lanai );
@@ -2552,7 +2555,7 @@ static int lanai_init_one(struct pci_dev *pci,
25522555 struct atm_dev * atmdev ;
25532556 int result ;
25542557
2555- lanai = kmalloc (sizeof (* lanai ), GFP_KERNEL );
2558+ lanai = kzalloc (sizeof (* lanai ), GFP_KERNEL );
25562559 if (lanai == NULL ) {
25572560 printk (KERN_ERR DEV_LABEL
25582561 ": couldn't allocate dev_data structure!\n" );
You can’t perform that action at this time.
0 commit comments