Commit 932d19c4 authored by Domen Puncer's avatar Domen Puncer Committed by Deepak Saxena

[PATCH] USB: some stv680 fixes

- swapRGB is already initialized to 0
- change "swapRGB_on == 1" to match in-source documentation
- submit urb with GFP_ATOMIC (interrupt context) - this made driver
   unusable because of "might_sleep" messages.
- group some "case"s
- release vdev on fail
- remove "kfree(0)" checking
parent 8dde8bf3
...@@ -490,10 +490,9 @@ static int stv_init (struct usb_stv *stv680) ...@@ -490,10 +490,9 @@ static int stv_init (struct usb_stv *stv680)
stv680->hue = 32767; stv680->hue = 32767;
stv680->palette = STV_VIDEO_PALETTE; stv680->palette = STV_VIDEO_PALETTE;
stv680->depth = 24; /* rgb24 bits */ stv680->depth = 24; /* rgb24 bits */
swapRGB = 0;
if ((swapRGB_on == 0) && (swapRGB == 0)) if ((swapRGB_on == 0) && (swapRGB == 0))
PDEBUG (1, "STV(i): swapRGB is (auto) OFF"); PDEBUG (1, "STV(i): swapRGB is (auto) OFF");
else if ((swapRGB_on == 1) && (swapRGB == 1)) else if ((swapRGB_on == 0) && (swapRGB == 1))
PDEBUG (1, "STV(i): swapRGB is (auto) ON"); PDEBUG (1, "STV(i): swapRGB is (auto) ON");
else if (swapRGB_on == 1) else if (swapRGB_on == 1)
PDEBUG (1, "STV(i): swapRGB is (forced) ON"); PDEBUG (1, "STV(i): swapRGB is (forced) ON");
...@@ -657,7 +656,7 @@ static void stv680_video_irq (struct urb *urb, struct pt_regs *regs) ...@@ -657,7 +656,7 @@ static void stv680_video_irq (struct urb *urb, struct pt_regs *regs)
/* Resubmit urb for new data */ /* Resubmit urb for new data */
urb->status = 0; urb->status = 0;
urb->dev = stv680->udev; urb->dev = stv680->udev;
if (usb_submit_urb (urb, GFP_KERNEL)) if (usb_submit_urb (urb, GFP_ATOMIC))
PDEBUG (0, "STV(e): urb burned down in video irq"); PDEBUG (0, "STV(e): urb burned down in video irq");
return; return;
} /* _video_irq */ } /* _video_irq */
...@@ -1252,13 +1251,10 @@ static int stv680_do_ioctl (struct inode *inode, struct file *file, ...@@ -1252,13 +1251,10 @@ static int stv680_do_ioctl (struct inode *inode, struct file *file,
return -EINVAL; return -EINVAL;
} }
case VIDIOCSFBUF: case VIDIOCSFBUF:
return -EINVAL;
case VIDIOCGTUNER: case VIDIOCGTUNER:
case VIDIOCSTUNER: case VIDIOCSTUNER:
return -EINVAL;
case VIDIOCGFREQ: case VIDIOCGFREQ:
case VIDIOCSFREQ: case VIDIOCSFREQ:
return -EINVAL;
case VIDIOCGAUDIO: case VIDIOCGAUDIO:
case VIDIOCSAUDIO: case VIDIOCSAUDIO:
return -EINVAL; return -EINVAL;
...@@ -1434,7 +1430,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id ...@@ -1434,7 +1430,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
if (video_register_device (stv680->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { if (video_register_device (stv680->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
PDEBUG (0, "STV(e): video_register_device failed"); PDEBUG (0, "STV(e): video_register_device failed");
retval = -EIO; retval = -EIO;
goto error; goto error_vdev;
} }
PDEBUG (0, "STV(i): registered new video device: video%d", stv680->vdev->minor); PDEBUG (0, "STV(i): registered new video device: video%d", stv680->vdev->minor);
...@@ -1442,6 +1438,8 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id ...@@ -1442,6 +1438,8 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
stv680_create_sysfs_files(stv680->vdev); stv680_create_sysfs_files(stv680->vdev);
return 0; return 0;
error_vdev:
video_device_release(stv680->vdev);
error: error:
kfree(stv680); kfree(stv680);
return retval; return retval;
...@@ -1466,9 +1464,7 @@ static inline void usb_stv680_remove_disconnected (struct usb_stv *stv680) ...@@ -1466,9 +1464,7 @@ static inline void usb_stv680_remove_disconnected (struct usb_stv *stv680)
kfree (stv680->sbuf[i].data); kfree (stv680->sbuf[i].data);
} }
for (i = 0; i < STV680_NUMSCRATCH; i++) for (i = 0; i < STV680_NUMSCRATCH; i++)
if (stv680->scratch[i].data) { kfree (stv680->scratch[i].data);
kfree (stv680->scratch[i].data);
}
PDEBUG (0, "STV(i): %s disconnected", stv680->camera_name); PDEBUG (0, "STV(i): %s disconnected", stv680->camera_name);
/* Free the memory */ /* Free the memory */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment