diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/storage/onetouch.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/storage/onetouch.c')
| -rw-r--r-- | drivers/usb/storage/onetouch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 80e65f29921c..198bb3ed95b2 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c | |||
| @@ -202,7 +202,7 @@ static int onetouch_connect_input(struct us_data *ss) | |||
| 202 | goto fail1; | 202 | goto fail1; |
| 203 | 203 | ||
| 204 | onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, | 204 | onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, |
| 205 | GFP_ATOMIC, &onetouch->data_dma); | 205 | GFP_KERNEL, &onetouch->data_dma); |
| 206 | if (!onetouch->data) | 206 | if (!onetouch->data) |
| 207 | goto fail1; | 207 | goto fail1; |
| 208 | 208 | ||