Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c3449fb authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Mauro Carvalho Chehab
Browse files

media: usb: hackrf: Replace GFP_ATOMIC with GFP_KERNEL 



hackrf_submit_urbs(), hackrf_alloc_stream_bufs() and hackrf_alloc_urbs()
are never called in atomic context.
They call usb_submit_urb(), usb_alloc_coherent() and usb_alloc_urb()
with GFP_ATOMIC, which is not necessary.
GFP_ATOMIC can be replaced with GFP_KERNEL.

This is found by a static analysis tool named DCNS written by myself.

Signed-off-by: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7a3369e8

drivers/media/usb/hackrf/hackrf.c

+3 −3
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int hackrf_submit_urbs(struct hackrf_dev *dev) 


	for (i = 0; i < dev->urbs_initialized; i++) {

		dev_dbg(dev->dev, "submit urb=%d\n", i);

		ret = usb_submit_urb(dev->urb_list[i], GFP_ATOMIC);

		ret = usb_submit_urb(dev->urb_list[i], GFP_KERNEL);

		if (ret) {

			dev_err(dev->dev, "Could not submit URB no. %d - get them all back\n",

					i);
@@ -636,7 +636,7 @@ static int hackrf_alloc_stream_bufs(struct hackrf_dev *dev) 


	for (dev->buf_num = 0; dev->buf_num < MAX_BULK_BUFS; dev->buf_num++) {

		dev->buf_list[dev->buf_num] = usb_alloc_coherent(dev->udev,

				BULK_BUFFER_SIZE, GFP_ATOMIC,

				BULK_BUFFER_SIZE, GFP_KERNEL,

				&dev->dma_addr[dev->buf_num]);

		if (!dev->buf_list[dev->buf_num]) {

			dev_dbg(dev->dev, "alloc buf=%d failed\n",
@@ -689,7 +689,7 @@ static int hackrf_alloc_urbs(struct hackrf_dev *dev, bool rcv) 
	/* allocate the URBs */

	for (i = 0; i < MAX_BULK_BUFS; i++) {

		dev_dbg(dev->dev, "alloc urb=%d\n", i);

		dev->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC);

		dev->urb_list[i] = usb_alloc_urb(0, GFP_KERNEL);

		if (!dev->urb_list[i]) {

			for (j = 0; j < i; j++)

				usb_free_urb(dev->urb_list[j]);