summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/misc/ufm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/misc/ufm.c')
-rw-r--r--sys/dev/usb/misc/ufm.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c
index c10166a..136182a 100644
--- a/sys/dev/usb/misc/ufm.c
+++ b/sys/dev/usb/misc/ufm.c
@@ -86,11 +86,9 @@ static device_attach_t ufm_attach;
static device_detach_t ufm_detach;
static usb_fifo_ioctl_t ufm_ioctl;
-static usb_fifo_open_t ufm_open;
static struct usb_fifo_methods ufm_fifo_methods = {
.f_ioctl = &ufm_ioctl,
- .f_open = &ufm_open,
.basename[0] = "ufm",
};
@@ -179,15 +177,6 @@ ufm_detach(device_t dev)
}
static int
-ufm_open(struct usb_fifo *dev, int fflags)
-{
- if ((fflags & (FWRITE | FREAD)) != (FWRITE | FREAD)) {
- return (EACCES);
- }
- return (0);
-}
-
-static int
ufm_do_req(struct ufm_softc *sc, uint8_t request,
uint16_t value, uint16_t index, uint8_t *retbuf)
{
@@ -315,6 +304,10 @@ ufm_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr,
struct ufm_softc *sc = usb_fifo_softc(fifo);
int error = 0;
+ if ((fflags & (FWRITE | FREAD)) != (FWRITE | FREAD)) {
+ return (EACCES);
+ }
+
switch (cmd) {
case FM_SET_FREQ:
error = ufm_set_freq(sc, addr);
OpenPOWER on IntegriCloud