File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -631,8 +631,7 @@ static int rtsx_usb_probe(struct usb_interface *intf,
631
631
632
632
ucr -> pusb_dev = usb_dev ;
633
633
634
- ucr -> iobuf = usb_alloc_coherent (ucr -> pusb_dev , IOBUF_SIZE ,
635
- GFP_KERNEL , & ucr -> iobuf_dma );
634
+ ucr -> iobuf = kmalloc (IOBUF_SIZE , GFP_KERNEL );
636
635
if (!ucr -> iobuf )
637
636
return - ENOMEM ;
638
637
@@ -668,8 +667,9 @@ static int rtsx_usb_probe(struct usb_interface *intf,
668
667
669
668
out_init_fail :
670
669
usb_set_intfdata (ucr -> pusb_intf , NULL );
671
- usb_free_coherent (ucr -> pusb_dev , IOBUF_SIZE , ucr -> iobuf ,
672
- ucr -> iobuf_dma );
670
+ kfree (ucr -> iobuf );
671
+ ucr -> iobuf = NULL ;
672
+ ucr -> cmd_buf = ucr -> rsp_buf = NULL ;
673
673
return ret ;
674
674
}
675
675
@@ -682,8 +682,9 @@ static void rtsx_usb_disconnect(struct usb_interface *intf)
682
682
mfd_remove_devices (& intf -> dev );
683
683
684
684
usb_set_intfdata (ucr -> pusb_intf , NULL );
685
- usb_free_coherent (ucr -> pusb_dev , IOBUF_SIZE , ucr -> iobuf ,
686
- ucr -> iobuf_dma );
685
+ kfree (ucr -> iobuf );
686
+ ucr -> iobuf = NULL ;
687
+ ucr -> cmd_buf = ucr -> rsp_buf = NULL ;
687
688
}
688
689
689
690
#ifdef CONFIG_PM
Original file line number Diff line number Diff line change @@ -55,7 +55,6 @@ struct rtsx_ucr {
55
55
struct usb_interface * pusb_intf ;
56
56
struct usb_sg_request current_sg ;
57
57
unsigned char * iobuf ;
58
- dma_addr_t iobuf_dma ;
59
58
60
59
struct timer_list sg_timer ;
61
60
struct mutex dev_mutex ;
You can’t perform that action at this time.
0 commit comments