File tree Expand file tree Collapse file tree 1 file changed +3
-9
lines changed
drivers/input/touchscreen Expand file tree Collapse file tree 1 file changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -615,10 +615,9 @@ static int wm97xx_register_touch(struct wm97xx *wm)
615
615
* extensions)
616
616
*/
617
617
wm -> touch_dev = platform_device_alloc ("wm97xx-touch" , -1 );
618
- if (!wm -> touch_dev ) {
619
- ret = - ENOMEM ;
620
- goto touch_err ;
621
- }
618
+ if (!wm -> touch_dev )
619
+ return - ENOMEM ;
620
+
622
621
platform_set_drvdata (wm -> touch_dev , wm );
623
622
wm -> touch_dev -> dev .parent = wm -> dev ;
624
623
wm -> touch_dev -> dev .platform_data = pdata ;
@@ -629,18 +628,13 @@ static int wm97xx_register_touch(struct wm97xx *wm)
629
628
return 0 ;
630
629
touch_reg_err :
631
630
platform_device_put (wm -> touch_dev );
632
- touch_err :
633
- input_unregister_device (wm -> input_dev );
634
- wm -> input_dev = NULL ;
635
631
636
632
return ret ;
637
633
}
638
634
639
635
static void wm97xx_unregister_touch (struct wm97xx * wm )
640
636
{
641
637
platform_device_unregister (wm -> touch_dev );
642
- input_unregister_device (wm -> input_dev );
643
- wm -> input_dev = NULL ;
644
638
}
645
639
646
640
static int _wm97xx_probe (struct wm97xx * wm )
You can’t perform that action at this time.
0 commit comments