Commit 84b3e425 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fix from Mauro Carvalho Chehab:
 "There's just one patch here, fixing a -Werror issue at
  staging/atomisp"

* tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: atomisp: restore missing 'return' statement
parents b60be028 206704a1

drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c

+2 −0
Original line number Diff line number Diff line
@@ -1646,6 +1646,8 @@ static input_system_err_t input_system_configure_channel_sensor( 
	default:

		return INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED;

	}



	return INPUT_SYSTEM_ERR_NO_ERROR;

}



// Test flags and set structure.