diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/usb/serial/empeg.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/usb/serial/empeg.c')
| -rw-r--r-- | drivers/usb/serial/empeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index 33c9e9cf9eb2..7dd0e3eadbe6 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
| @@ -391,7 +391,7 @@ static void empeg_unthrottle(struct tty_struct *tty) | |||
| 391 | dbg("%s - port %d", __func__, port->number); | 391 | dbg("%s - port %d", __func__, port->number); |
| 392 | 392 | ||
| 393 | port->read_urb->dev = port->serial->dev; | 393 | port->read_urb->dev = port->serial->dev; |
| 394 | result = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 394 | result = usb_submit_urb(port->read_urb, GFP_KERNEL); |
| 395 | if (result) | 395 | if (result) |
| 396 | dev_err(&port->dev, | 396 | dev_err(&port->dev, |
| 397 | "%s - failed submitting read urb, error %d\n", | 397 | "%s - failed submitting read urb, error %d\n", |